| [ee54da9] | 1 | Java can only be built as 1 ABI at the moment. So this switch will all | 
|---|
|  | 2 | the disabling of only the java multilib build | 
|---|
|  | 3 |  | 
|---|
|  | 4 | diff -Naur gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure | 
|---|
|  | 5 | --- gcc-4.4.0.orig/libjava/configure    2009-07-14 09:25:46.000000000 -0700 | 
|---|
|  | 6 | +++ gcc-4.4.0/libjava/configure 2009-07-14 09:33:34.000000000 -0700 | 
|---|
|  | 7 | @@ -1021,6 +1021,8 @@ | 
|---|
|  | 8 | default=yes | 
|---|
|  | 9 | --enable-java-maintainer-mode | 
|---|
|  | 10 | allow rebuilding of .class and .h files | 
|---|
|  | 11 | +  --enable-libjava-multilib | 
|---|
|  | 12 | +                          build libjava as multilib | 
|---|
|  | 13 | --disable-dependency-tracking  speeds up one-time build | 
|---|
|  | 14 | --enable-dependency-tracking   do not reject slow dependency extractors | 
|---|
|  | 15 | --enable-maintainer-mode  enable make rules and dependencies not useful | 
|---|
|  | 16 | @@ -1973,6 +1975,16 @@ | 
|---|
|  | 17 | fi | 
|---|
|  | 18 |  | 
|---|
|  | 19 |  | 
|---|
|  | 20 | +# Check whether --enable-libjava-multilib was given. | 
|---|
|  | 21 | +if test "${enable_libjava_multilib+set}" = set; then | 
|---|
|  | 22 | +  enableval=$enable_libjava_multilib; | 
|---|
|  | 23 | +fi | 
|---|
|  | 24 | + | 
|---|
|  | 25 | +if test "$enable_libjava_multilib" = no; then | 
|---|
|  | 26 | +  multilib=no | 
|---|
|  | 27 | +  ac_configure_args="$ac_configure_args --disable-multilib" | 
|---|
|  | 28 | +fi | 
|---|
|  | 29 | + | 
|---|
|  | 30 | # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. | 
|---|
|  | 31 |  | 
|---|
|  | 32 |  | 
|---|
|  | 33 | diff -Naur gcc-4.4.0.orig/libjava/configure.ac gcc-4.4.0/libjava/configure.ac | 
|---|
|  | 34 | --- gcc-4.4.0.orig/libjava/configure.ac 2009-07-14 09:25:46.000000000 -0700 | 
|---|
|  | 35 | +++ gcc-4.4.0/libjava/configure.ac      2009-07-14 09:33:34.000000000 -0700 | 
|---|
|  | 36 | @@ -139,6 +139,13 @@ | 
|---|
|  | 37 | [allow rebuilding of .class and .h files])) | 
|---|
|  | 38 | AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes) | 
|---|
|  | 39 |  | 
|---|
|  | 40 | +AC_ARG_ENABLE(libjava-multilib, | 
|---|
|  | 41 | +       AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib])) | 
|---|
|  | 42 | +if test "$enable_libjava_multilib" = no; then | 
|---|
|  | 43 | +  multilib=no | 
|---|
|  | 44 | +  ac_configure_args="$ac_configure_args --disable-multilib" | 
|---|
|  | 45 | +fi | 
|---|
|  | 46 | + | 
|---|
|  | 47 | # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. | 
|---|
|  | 48 | GCC_NO_EXECUTABLES | 
|---|
|  | 49 |  | 
|---|