author | "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> |
Sun Jun 13 20:25:00 2010 +0200 (2010-06-13) | |
changeset 1979 | 22ce0c19f06a |
child 2148 | ada9128c98b8 |
permissions | -rw-r--r-- |
yann@1948 | 1 |
diff -durN gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure |
yann@1948 | 2 |
|
yann@1948 | 3 |
diff -durN gcc-4.4.4.orig/libjava/configure gcc-4.4.4/libjava/configure |
yann@1948 | 4 |
--- gcc-4.4.4.orig/libjava/configure 2010-04-29 10:26:54.000000000 +0200 |
yann@1948 | 5 |
+++ gcc-4.4.4/libjava/configure 2010-05-16 19:10:49.000000000 +0200 |
yann@1948 | 6 |
@@ -1021,6 +1021,8 @@ |
yann@1948 | 7 |
default=yes |
yann@1948 | 8 |
--enable-java-maintainer-mode |
yann@1948 | 9 |
allow rebuilding of .class and .h files |
yann@1948 | 10 |
+ --enable-libjava-multilib |
yann@1948 | 11 |
+ build libjava as multilib |
yann@1948 | 12 |
--disable-dependency-tracking speeds up one-time build |
yann@1948 | 13 |
--enable-dependency-tracking do not reject slow dependency extractors |
yann@1948 | 14 |
--enable-maintainer-mode enable make rules and dependencies not useful |
yann@1948 | 15 |
@@ -1973,6 +1975,16 @@ |
yann@1948 | 16 |
fi |
yann@1948 | 17 |
|
yann@1948 | 18 |
|
yann@1948 | 19 |
+# Check whether --enable-libjava-multilib was given. |
yann@1948 | 20 |
+if test "${enable_libjava_multilib+set}" = set; then |
yann@1948 | 21 |
+ enableval=$enable_libjava_multilib; |
yann@1948 | 22 |
+fi |
yann@1948 | 23 |
+ |
yann@1948 | 24 |
+if test "$enable_libjava_multilib" = no; then |
yann@1948 | 25 |
+ multilib=no |
yann@1948 | 26 |
+ ac_configure_args="$ac_configure_args --disable-multilib" |
yann@1948 | 27 |
+fi |
yann@1948 | 28 |
+ |
yann@1948 | 29 |
# It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. |
yann@1948 | 30 |
|
yann@1948 | 31 |
|
yann@1948 | 32 |
diff -durN gcc-4.4.4.orig/libjava/configure.ac gcc-4.4.4/libjava/configure.ac |
yann@1948 | 33 |
--- gcc-4.4.4.orig/libjava/configure.ac 2010-04-21 19:04:42.000000000 +0200 |
yann@1948 | 34 |
+++ gcc-4.4.4/libjava/configure.ac 2010-05-16 19:10:49.000000000 +0200 |
yann@1948 | 35 |
@@ -139,6 +139,13 @@ |
yann@1948 | 36 |
[allow rebuilding of .class and .h files])) |
yann@1948 | 37 |
AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes) |
yann@1948 | 38 |
|
yann@1948 | 39 |
+AC_ARG_ENABLE(libjava-multilib, |
yann@1948 | 40 |
+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib])) |
yann@1948 | 41 |
+if test "$enable_libjava_multilib" = no; then |
yann@1948 | 42 |
+ multilib=no |
yann@1948 | 43 |
+ ac_configure_args="$ac_configure_args --disable-multilib" |
yann@1948 | 44 |
+fi |
yann@1948 | 45 |
+ |
yann@1948 | 46 |
# It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. |
yann@1948 | 47 |
GCC_NO_EXECUTABLES |
yann@1948 | 48 |