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