patches/gcc/4.4.2/120-java-nomulti.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:47:16 2010 +0200 (2010-07-29)
changeset 2045 fdaa6c7f6dea
parent 1544 2228ea3f6b79
permissions -rw-r--r--
cc/gcc: add option to compile against static libstdc++, for gcc-4.4 and newer

Idea and know-how taken from CodeSourcery build script.

Normal build:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb77f3000)
libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0xb76e8000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb75a1000)
libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb757a000)
/lib/ld-linux.so.2 (0xb77f4000)
libgcc_s.so.1 => /lib/libgcc_s.so.1 (0xb755c000)

CC_STATIC_LIBSTDCXX=y:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb7843000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb76e6000)
/lib/ld-linux.so.2 (0xb7844000)

I made CC_STATIC_LIBSTDCXX default=y since I think
it is always desirable.

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