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