1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/gcc/4.4.0/120-java-nomulti.patch	Tue Jan 12 19:24:03 2010 +0100
     1.3 @@ -0,0 +1,46 @@
     1.4 +diff -durN gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure
     1.5 +--- gcc-4.4.0.orig/libjava/configure	2009-04-21 11:08:08.000000000 +0200
     1.6 ++++ gcc-4.4.0/libjava/configure	2009-05-27 21:38:03.000000000 +0200
     1.7 +@@ -1021,6 +1021,8 @@
     1.8 +                           default=yes
     1.9 +   --enable-java-maintainer-mode
    1.10 +                           allow rebuilding of .class and .h files
    1.11 ++  --enable-libjava-multilib
    1.12 ++                          build libjava as multilib
    1.13 +   --disable-dependency-tracking  speeds up one-time build
    1.14 +   --enable-dependency-tracking   do not reject slow dependency extractors
    1.15 +   --enable-maintainer-mode  enable make rules and dependencies not useful
    1.16 +@@ -1973,6 +1975,16 @@
    1.17 + fi
    1.18 + 
    1.19 + 
    1.20 ++# Check whether --enable-libjava-multilib was given.
    1.21 ++if test "${enable_libjava_multilib+set}" = set; then
    1.22 ++  enableval=$enable_libjava_multilib;
    1.23 ++fi
    1.24 ++
    1.25 ++if test "$enable_libjava_multilib" = no; then
    1.26 ++  multilib=no
    1.27 ++  ac_configure_args="$ac_configure_args --disable-multilib"
    1.28 ++fi
    1.29 ++
    1.30 + # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
    1.31 + 
    1.32 + 
    1.33 +diff -durN gcc-4.4.0.orig/libjava/configure.ac gcc-4.4.0/libjava/configure.ac
    1.34 +--- gcc-4.4.0.orig/libjava/configure.ac	2009-04-09 23:54:28.000000000 +0200
    1.35 ++++ gcc-4.4.0/libjava/configure.ac	2009-05-27 21:38:03.000000000 +0200
    1.36 +@@ -139,6 +139,13 @@
    1.37 + 	[allow rebuilding of .class and .h files]))
    1.38 + AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
    1.39 + 
    1.40 ++AC_ARG_ENABLE(libjava-multilib,
    1.41 ++	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
    1.42 ++if test "$enable_libjava_multilib" = no; then
    1.43 ++  multilib=no
    1.44 ++  ac_configure_args="$ac_configure_args --disable-multilib"
    1.45 ++fi
    1.46 ++
    1.47 + # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
    1.48 + GCC_NO_EXECUTABLES
    1.49 +