author | "Yann E. MORIN" <yann.morin.1998@free.fr> |
Tue May 29 18:52:13 2012 +0200 (2012-05-29) | |
changeset 2988 | a57b8a45ea26 |
parent 2124 | 5dd0b83ae528 |
permissions | -rw-r--r-- |
thomas@1461 | 1 |
Original patch from: ../4.3.2/120-java-nomulti.patch |
thomas@1461 | 2 |
|
thomas@1461 | 3 |
-= BEGIN original header =- |
thomas@1461 | 4 |
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/03_all_gcc43-java-nomulti.patch |
thomas@1461 | 5 |
-= END original header =- |
thomas@1461 | 6 |
|
thomas@1461 | 7 |
diff -durN gcc-4.3.3.orig/libjava/configure gcc-4.3.3/libjava/configure |
thomas@1461 | 8 |
--- gcc-4.3.3.orig/libjava/configure 2009-01-24 11:32:29.000000000 +0100 |
thomas@1461 | 9 |
+++ gcc-4.3.3/libjava/configure 2009-01-27 22:19:14.000000000 +0100 |
thomas@1461 | 10 |
@@ -1018,6 +1018,8 @@ |
thomas@1461 | 11 |
--enable-gconf-peer compile GConf native peers for util.preferences |
thomas@1461 | 12 |
--enable-java-maintainer-mode |
thomas@1461 | 13 |
allow rebuilding of .class and .h files |
thomas@1461 | 14 |
+ --enable-libjava-multilib |
thomas@1461 | 15 |
+ build libjava as multilib |
thomas@1461 | 16 |
--disable-dependency-tracking speeds up one-time build |
thomas@1461 | 17 |
--enable-dependency-tracking do not reject slow dependency extractors |
thomas@1461 | 18 |
--enable-maintainer-mode enable make rules and dependencies not useful |
thomas@1461 | 19 |
@@ -1850,6 +1852,16 @@ |
thomas@1461 | 20 |
fi |
thomas@1461 | 21 |
|
thomas@1461 | 22 |
|
thomas@1461 | 23 |
+# Check whether --enable-libjava-multilib was given. |
thomas@1461 | 24 |
+if test "${enable_libjava_multilib+set}" = set; then |
thomas@1461 | 25 |
+ enableval=$enable_libjava_multilib; |
thomas@1461 | 26 |
+fi |
thomas@1461 | 27 |
+ |
thomas@1461 | 28 |
+if test "$enable_libjava_multilib" = no; then |
thomas@1461 | 29 |
+ multilib=no |
thomas@1461 | 30 |
+ ac_configure_args="$ac_configure_args --disable-multilib" |
thomas@1461 | 31 |
+fi |
thomas@1461 | 32 |
+ |
thomas@1461 | 33 |
# It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. |
thomas@1461 | 34 |
|
thomas@1461 | 35 |
|
thomas@1461 | 36 |
diff -durN gcc-4.3.3.orig/libjava/configure.ac gcc-4.3.3/libjava/configure.ac |
thomas@1461 | 37 |
--- gcc-4.3.3.orig/libjava/configure.ac 2008-07-02 23:23:43.000000000 +0200 |
thomas@1461 | 38 |
+++ gcc-4.3.3/libjava/configure.ac 2009-01-27 22:19:14.000000000 +0100 |
thomas@1461 | 39 |
@@ -82,6 +82,13 @@ |
thomas@1461 | 40 |
[allow rebuilding of .class and .h files])) |
thomas@1461 | 41 |
AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes) |
thomas@1461 | 42 |
|
thomas@1461 | 43 |
+AC_ARG_ENABLE(libjava-multilib, |
thomas@1461 | 44 |
+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib])) |
thomas@1461 | 45 |
+if test "$enable_libjava_multilib" = no; then |
thomas@1461 | 46 |
+ multilib=no |
thomas@1461 | 47 |
+ ac_configure_args="$ac_configure_args --disable-multilib" |
thomas@1461 | 48 |
+fi |
thomas@1461 | 49 |
+ |
thomas@1461 | 50 |
# It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. |
thomas@1461 | 51 |
GCC_NO_EXECUTABLES |
thomas@1461 | 52 |