summaryrefslogtreecommitdiff
path: root/patches/gcc/4.4.5/120-java-nomulti.patch
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-10-09 21:28:39 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-10-09 21:28:39 (GMT)
commitd34501d3c7bad3bdefd898b6a3ce65db03e4e4e6 (patch)
tree782c6aeb8b37011aa524c5de5d12013bce70c6f2 /patches/gcc/4.4.5/120-java-nomulti.patch
parent1bb327e7c9e0021c762313645a8afa3bf32699d8 (diff)
cc/gcc: add 4.4.5
Add 4.4.5, propagate patchset from 4.4.4. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Diffstat (limited to 'patches/gcc/4.4.5/120-java-nomulti.patch')
-rw-r--r--patches/gcc/4.4.5/120-java-nomulti.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/patches/gcc/4.4.5/120-java-nomulti.patch b/patches/gcc/4.4.5/120-java-nomulti.patch
new file mode 100644
index 0000000..aded63e
--- /dev/null
+++ b/patches/gcc/4.4.5/120-java-nomulti.patch
@@ -0,0 +1,46 @@
+diff -durN gcc-4.4.5.orig/libjava/configure gcc-4.4.5/libjava/configure
+--- gcc-4.4.5.orig/libjava/configure 2010-10-01 10:26:18.000000000 +0200
++++ gcc-4.4.5/libjava/configure 2010-10-09 22:58:04.000000000 +0200
+@@ -1022,6 +1022,8 @@
+ default=yes
+ --enable-java-maintainer-mode
+ allow rebuilding of .class and .h files
++ --enable-libjava-multilib
++ build libjava as multilib
+ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-maintainer-mode enable make rules and dependencies not useful
+@@ -1974,6 +1976,16 @@
+ fi
+
+
++# Check whether --enable-libjava-multilib was given.
++if test "${enable_libjava_multilib+set}" = set; then
++ enableval=$enable_libjava_multilib;
++fi
++
++if test "$enable_libjava_multilib" = no; then
++ multilib=no
++ ac_configure_args="$ac_configure_args --disable-multilib"
++fi
++
+ # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
+
+
+diff -durN gcc-4.4.5.orig/libjava/configure.ac gcc-4.4.5/libjava/configure.ac
+--- gcc-4.4.5.orig/libjava/configure.ac 2010-06-11 13:49:16.000000000 +0200
++++ gcc-4.4.5/libjava/configure.ac 2010-10-09 22:58:04.000000000 +0200
+@@ -139,6 +139,13 @@
+ [allow rebuilding of .class and .h files]))
+ AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
+
++AC_ARG_ENABLE(libjava-multilib,
++ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
++if test "$enable_libjava_multilib" = no; then
++ multilib=no
++ ac_configure_args="$ac_configure_args --disable-multilib"
++fi
++
+ # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
+ GCC_NO_EXECUTABLES
+