| diff -durN gcc-4.4.4.orig/libjava/configure gcc-4.4.4/libjava/configure |
| --- gcc-4.4.4.orig/libjava/configure 2010-04-29 10:26:54.000000000 +0200 |
| +++ gcc-4.4.4/libjava/configure 2010-05-16 19:10:49.000000000 +0200 |
| @@ -1021,6 +1021,8 @@ |
| default=yes |
| --enable-java-maintainer-mode |
| allow rebuilding of .class and .h files |
| + --enable-libjava-multilib |
| + build libjava as multilib |
| --disable-dependency-tracking speeds up one-time build |
| --enable-dependency-tracking do not reject slow dependency extractors |
| --enable-maintainer-mode enable make rules and dependencies not useful |
| @@ -1973,6 +1975,16 @@ |
| fi |
| |
| |
| +# Check whether --enable-libjava-multilib was given. |
| +if test "${enable_libjava_multilib+set}" = set; then |
| + enableval=$enable_libjava_multilib; |
| +fi |
| + |
| +if test "$enable_libjava_multilib" = no; then |
| + multilib=no |
| + ac_configure_args="$ac_configure_args --disable-multilib" |
| +fi |
| + |
| # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. |
| |
| |
| diff -durN gcc-4.4.4.orig/libjava/configure.ac gcc-4.4.4/libjava/configure.ac |
| --- gcc-4.4.4.orig/libjava/configure.ac 2010-04-21 19:04:42.000000000 +0200 |
| +++ gcc-4.4.4/libjava/configure.ac 2010-05-16 19:10:49.000000000 +0200 |
| @@ -139,6 +139,13 @@ |
| [allow rebuilding of .class and .h files])) |
| AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes) |
| |
| +AC_ARG_ENABLE(libjava-multilib, |
| + AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib])) |
| +if test "$enable_libjava_multilib" = no; then |
| + multilib=no |
| + ac_configure_args="$ac_configure_args --disable-multilib" |
| +fi |
| + |
| # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. |
| GCC_NO_EXECUTABLES |
| |
