patches/gcc/4.4.5/120-java-nomulti.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Jul 17 17:54:21 2011 +0200 (2011-07-17)
changeset 2888 dd71df95903a
permissions -rw-r--r--
cc/gcc: pass the companion libs prefix to cc_core

In case of canadian-cross, the companion libraries are not the same for
the core cc (they run on 'build') as they are for the final cc (they run
on 'host').

Prepare for this differentiation (coming later), while retaining the
current behavior (to use the same compblibs).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@2149
     1
diff -durN gcc-4.4.5.orig/libjava/configure gcc-4.4.5/libjava/configure
yann@2149
     2
--- gcc-4.4.5.orig/libjava/configure	2010-10-01 10:26:18.000000000 +0200
yann@2149
     3
+++ gcc-4.4.5/libjava/configure	2010-10-09 22:58:04.000000000 +0200
yann@2149
     4
@@ -1022,6 +1022,8 @@
yann@2149
     5
                           default=yes
yann@2149
     6
   --enable-java-maintainer-mode
yann@2149
     7
                           allow rebuilding of .class and .h files
yann@2149
     8
+  --enable-libjava-multilib
yann@2149
     9
+                          build libjava as multilib
yann@2149
    10
   --disable-dependency-tracking  speeds up one-time build
yann@2149
    11
   --enable-dependency-tracking   do not reject slow dependency extractors
yann@2149
    12
   --enable-maintainer-mode  enable make rules and dependencies not useful
yann@2149
    13
@@ -1974,6 +1976,16 @@
yann@2149
    14
 fi
yann@2149
    15
 
yann@2149
    16
 
yann@2149
    17
+# Check whether --enable-libjava-multilib was given.
yann@2149
    18
+if test "${enable_libjava_multilib+set}" = set; then
yann@2149
    19
+  enableval=$enable_libjava_multilib;
yann@2149
    20
+fi
yann@2149
    21
+
yann@2149
    22
+if test "$enable_libjava_multilib" = no; then
yann@2149
    23
+  multilib=no
yann@2149
    24
+  ac_configure_args="$ac_configure_args --disable-multilib"
yann@2149
    25
+fi
yann@2149
    26
+
yann@2149
    27
 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
yann@2149
    28
 
yann@2149
    29
 
yann@2149
    30
diff -durN gcc-4.4.5.orig/libjava/configure.ac gcc-4.4.5/libjava/configure.ac
yann@2149
    31
--- gcc-4.4.5.orig/libjava/configure.ac	2010-06-11 13:49:16.000000000 +0200
yann@2149
    32
+++ gcc-4.4.5/libjava/configure.ac	2010-10-09 22:58:04.000000000 +0200
yann@2149
    33
@@ -139,6 +139,13 @@
yann@2149
    34
 	[allow rebuilding of .class and .h files]))
yann@2149
    35
 AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
yann@2149
    36
 
yann@2149
    37
+AC_ARG_ENABLE(libjava-multilib,
yann@2149
    38
+	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
yann@2149
    39
+if test "$enable_libjava_multilib" = no; then
yann@2149
    40
+  multilib=no
yann@2149
    41
+  ac_configure_args="$ac_configure_args --disable-multilib"
yann@2149
    42
+fi
yann@2149
    43
+
yann@2149
    44
 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
yann@2149
    45
 GCC_NO_EXECUTABLES
yann@2149
    46