1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/gcc/4.3.3/120-java-nomulti.patch Sun Jul 03 22:32:36 2011 +0200
1.3 @@ -0,0 +1,52 @@
1.4 +Original patch from: ../4.3.2/120-java-nomulti.patch
1.5 +
1.6 +-= BEGIN original header =-
1.7 +Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/03_all_gcc43-java-nomulti.patch
1.8 +-= END original header =-
1.9 +
1.10 +diff -durN gcc-4.3.3.orig/libjava/configure gcc-4.3.3/libjava/configure
1.11 +--- gcc-4.3.3.orig/libjava/configure 2009-01-24 11:32:29.000000000 +0100
1.12 ++++ gcc-4.3.3/libjava/configure 2009-01-27 22:19:14.000000000 +0100
1.13 +@@ -1018,6 +1018,8 @@
1.14 + --enable-gconf-peer compile GConf native peers for util.preferences
1.15 + --enable-java-maintainer-mode
1.16 + allow rebuilding of .class and .h files
1.17 ++ --enable-libjava-multilib
1.18 ++ build libjava as multilib
1.19 + --disable-dependency-tracking speeds up one-time build
1.20 + --enable-dependency-tracking do not reject slow dependency extractors
1.21 + --enable-maintainer-mode enable make rules and dependencies not useful
1.22 +@@ -1850,6 +1852,16 @@
1.23 + fi
1.24 +
1.25 +
1.26 ++# Check whether --enable-libjava-multilib was given.
1.27 ++if test "${enable_libjava_multilib+set}" = set; then
1.28 ++ enableval=$enable_libjava_multilib;
1.29 ++fi
1.30 ++
1.31 ++if test "$enable_libjava_multilib" = no; then
1.32 ++ multilib=no
1.33 ++ ac_configure_args="$ac_configure_args --disable-multilib"
1.34 ++fi
1.35 ++
1.36 + # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
1.37 +
1.38 +
1.39 +diff -durN gcc-4.3.3.orig/libjava/configure.ac gcc-4.3.3/libjava/configure.ac
1.40 +--- gcc-4.3.3.orig/libjava/configure.ac 2008-07-02 23:23:43.000000000 +0200
1.41 ++++ gcc-4.3.3/libjava/configure.ac 2009-01-27 22:19:14.000000000 +0100
1.42 +@@ -82,6 +82,13 @@
1.43 + [allow rebuilding of .class and .h files]))
1.44 + AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
1.45 +
1.46 ++AC_ARG_ENABLE(libjava-multilib,
1.47 ++ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
1.48 ++if test "$enable_libjava_multilib" = no; then
1.49 ++ multilib=no
1.50 ++ ac_configure_args="$ac_configure_args --disable-multilib"
1.51 ++fi
1.52 ++
1.53 + # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
1.54 + GCC_NO_EXECUTABLES
1.55 +