patches/gcc/4.4.4/120-java-nomulti.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Thu Dec 23 20:43:32 2010 +0100 (2010-12-23)
changeset 2307 2efd46963086
parent 1948 d341be24dc68
permissions -rw-r--r--
buildtools: move to working directory

There is absolutely *no* reason for the buildtools (wrappers to gcc, g++,
as, ld... for the local machine) to be in the toolchain directory. Moreover,
they are removed after the build completes.

Move them out of the toolchain directory, and into the build directory (but
yet the part specific to the current toolchain). This means we no longer
need to explicitly remove them either, BTW, but we need to save/restore them
for the restart feature.

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