1.1 --- a/patches/gcc/4.3.0/150-gcc43-java-nomulti.patch Mon Jul 28 20:17:48 2008 +0000
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,47 +0,0 @@
1.4 -Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.0/gentoo/03_all_gcc43-java-nomulti.patch
1.5 -diff -durN gcc-4.3.0.orig/libjava/configure gcc-4.3.0/libjava/configure
1.6 ---- gcc-4.3.0.orig/libjava/configure 2008-03-05 19:44:25.000000000 +0100
1.7 -+++ gcc-4.3.0/libjava/configure 2008-06-10 14:44:13.000000000 +0200
1.8 -@@ -1018,6 +1018,8 @@
1.9 - --enable-gconf-peer compile GConf native peers for util.preferences
1.10 - --enable-java-maintainer-mode
1.11 - allow rebuilding of .class and .h files
1.12 -+ --enable-libjava-multilib
1.13 -+ build libjava as multilib
1.14 - --disable-dependency-tracking speeds up one-time build
1.15 - --enable-dependency-tracking do not reject slow dependency extractors
1.16 - --enable-maintainer-mode enable make rules and dependencies not useful
1.17 -@@ -1850,6 +1852,16 @@
1.18 - fi
1.19 -
1.20 -
1.21 -+# Check whether --enable-libjava-multilib was given.
1.22 -+if test "${enable_libjava_multilib+set}" = set; then
1.23 -+ enableval=$enable_libjava_multilib;
1.24 -+fi
1.25 -+
1.26 -+if test "$enable_libjava_multilib" = no; then
1.27 -+ multilib=no
1.28 -+ ac_configure_args="$ac_configure_args --disable-multilib"
1.29 -+fi
1.30 -+
1.31 - # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
1.32 -
1.33 -
1.34 -diff -durN gcc-4.3.0.orig/libjava/configure.ac gcc-4.3.0/libjava/configure.ac
1.35 ---- gcc-4.3.0.orig/libjava/configure.ac 2007-12-22 16:48:46.000000000 +0100
1.36 -+++ gcc-4.3.0/libjava/configure.ac 2008-06-10 14:44:13.000000000 +0200
1.37 -@@ -82,6 +82,13 @@
1.38 - [allow rebuilding of .class and .h files]))
1.39 - AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
1.40 -
1.41 -+AC_ARG_ENABLE(libjava-multilib,
1.42 -+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
1.43 -+if test "$enable_libjava_multilib" = no; then
1.44 -+ multilib=no
1.45 -+ ac_configure_args="$ac_configure_args --disable-multilib"
1.46 -+fi
1.47 -+
1.48 - # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
1.49 - GCC_NO_EXECUTABLES
1.50 -