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