yann@1162: Original patch from: ../4.3.2/120-java-nomulti.patch
yann@1162: 
yann@1162: -= BEGIN original header =-
yann@1162: Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/03_all_gcc43-java-nomulti.patch
yann@1162: -= END original header =-
yann@1162: 
yann@1162: diff -durN gcc-4.3.3.orig/libjava/configure gcc-4.3.3/libjava/configure
yann@1162: --- gcc-4.3.3.orig/libjava/configure	2009-01-24 11:32:29.000000000 +0100
yann@1162: +++ gcc-4.3.3/libjava/configure	2009-01-27 22:19:14.000000000 +0100
yann@1162: @@ -1018,6 +1018,8 @@
yann@1162:    --enable-gconf-peer     compile GConf native peers for util.preferences
yann@1162:    --enable-java-maintainer-mode
yann@1162:                            allow rebuilding of .class and .h files
yann@1162: +  --enable-libjava-multilib
yann@1162: +                          build libjava as multilib
yann@1162:    --disable-dependency-tracking  speeds up one-time build
yann@1162:    --enable-dependency-tracking   do not reject slow dependency extractors
yann@1162:    --enable-maintainer-mode  enable make rules and dependencies not useful
yann@1162: @@ -1850,6 +1852,16 @@
yann@1162:  fi
yann@1162:  
yann@1162:  
yann@1162: +# Check whether --enable-libjava-multilib was given.
yann@1162: +if test "${enable_libjava_multilib+set}" = set; then
yann@1162: +  enableval=$enable_libjava_multilib;
yann@1162: +fi
yann@1162: +
yann@1162: +if test "$enable_libjava_multilib" = no; then
yann@1162: +  multilib=no
yann@1162: +  ac_configure_args="$ac_configure_args --disable-multilib"
yann@1162: +fi
yann@1162: +
yann@1162:  # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
yann@1162:  
yann@1162:  
yann@1162: diff -durN gcc-4.3.3.orig/libjava/configure.ac gcc-4.3.3/libjava/configure.ac
yann@1162: --- gcc-4.3.3.orig/libjava/configure.ac	2008-07-02 23:23:43.000000000 +0200
yann@1162: +++ gcc-4.3.3/libjava/configure.ac	2009-01-27 22:19:14.000000000 +0100
yann@1162: @@ -82,6 +82,13 @@
yann@1162:  	[allow rebuilding of .class and .h files]))
yann@1162:  AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
yann@1162:  
yann@1162: +AC_ARG_ENABLE(libjava-multilib,
yann@1162: +	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
yann@1162: +if test "$enable_libjava_multilib" = no; then
yann@1162: +  multilib=no
yann@1162: +  ac_configure_args="$ac_configure_args --disable-multilib"
yann@1162: +fi
yann@1162: +
yann@1162:  # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
yann@1162:  GCC_NO_EXECUTABLES
yann@1162: