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