patches/gcc/4.3.0/120-java-nomulti.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed May 20 20:13:13 2009 +0000 (2009-05-20)
changeset 1345 27fec561af53
parent 746 b150d6f590fc
permissions -rw-r--r--
Merge the uClinux/noMMU stuff back to /trunk:
- merge Linux and uClinux back to a single kernel
- add ARCH_USE_MMU and acquainted config options that
architectures can auto-select
- make binutils and elf2flt two "Binary utilities" that
go in a single common sub-{menu,directory} structure

-------- diffstat follows --------
/trunk/scripts/build/kernel/uclinux.sh | 2 0 2 0 -
/trunk/scripts/build/kernel/linux.sh | 206 204 2 0 +++++++++++++++++++++++++++++
/trunk/scripts/build/kernel/linux-common.sh | 198 0 198 0 ----------------------------
/trunk/scripts/build/binutils.sh | 232 0 232 0 --------------------------------
/trunk/scripts/build/elf2flt.sh | 150 0 150 0 ---------------------
/trunk/scripts/crosstool-NG.sh.in | 6 4 2 0 +
/trunk/config/kernel/linux.in | 249 249 0 0 +++++++++++++++++++++++++++++++++++
/trunk/config/kernel/linux.in-common | 252 0 252 0 -----------------------------------
/trunk/config/kernel/uclinux.in | 21 0 21 0 ---
/trunk/config/target.in | 23 22 1 0 +++
/trunk/config/elf2flt.in | 49 0 49 0 -------
/trunk/config/libc/glibc.in | 2 1 1 0
/trunk/config/libc/eglibc.in | 2 1 1 0
/trunk/config/config.in | 1 0 1 0 -
/trunk/config/arch/sh.in | 1 1 0 0 +
/trunk/config/arch/arm.in | 2 1 1 0
/trunk/config/arch/powerpc.in | 1 1 0 0 +
/trunk/config/arch/ia64.in | 1 1 0 0 +
/trunk/config/arch/alpha.in | 1 1 0 0 +
/trunk/config/arch/x86.in | 1 1 0 0 +
/trunk/config/arch/mips.in | 1 1 0 0 +
/trunk/config/arch/powerpc64.in | 1 1 0 0 +
22 files changed, 489 insertions(+), 913 deletions(-)
yann@552
     1
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.0/gentoo/03_all_gcc43-java-nomulti.patch
yann@552
     2
diff -durN gcc-4.3.0.orig/libjava/configure gcc-4.3.0/libjava/configure
yann@552
     3
--- gcc-4.3.0.orig/libjava/configure	2008-03-05 19:44:25.000000000 +0100
yann@552
     4
+++ gcc-4.3.0/libjava/configure	2008-06-10 14:44:13.000000000 +0200
yann@552
     5
@@ -1018,6 +1018,8 @@
yann@552
     6
   --enable-gconf-peer     compile GConf native peers for util.preferences
yann@552
     7
   --enable-java-maintainer-mode
yann@552
     8
                           allow rebuilding of .class and .h files
yann@552
     9
+  --enable-libjava-multilib
yann@552
    10
+                          build libjava as multilib
yann@552
    11
   --disable-dependency-tracking  speeds up one-time build
yann@552
    12
   --enable-dependency-tracking   do not reject slow dependency extractors
yann@552
    13
   --enable-maintainer-mode  enable make rules and dependencies not useful
yann@552
    14
@@ -1850,6 +1852,16 @@
yann@552
    15
 fi
yann@552
    16
 
yann@552
    17
 
yann@552
    18
+# Check whether --enable-libjava-multilib was given.
yann@552
    19
+if test "${enable_libjava_multilib+set}" = set; then
yann@552
    20
+  enableval=$enable_libjava_multilib;
yann@552
    21
+fi
yann@552
    22
+
yann@552
    23
+if test "$enable_libjava_multilib" = no; then
yann@552
    24
+  multilib=no
yann@552
    25
+  ac_configure_args="$ac_configure_args --disable-multilib"
yann@552
    26
+fi
yann@552
    27
+
yann@552
    28
 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
yann@552
    29
 
yann@552
    30
 
yann@552
    31
diff -durN gcc-4.3.0.orig/libjava/configure.ac gcc-4.3.0/libjava/configure.ac
yann@552
    32
--- gcc-4.3.0.orig/libjava/configure.ac	2007-12-22 16:48:46.000000000 +0100
yann@552
    33
+++ gcc-4.3.0/libjava/configure.ac	2008-06-10 14:44:13.000000000 +0200
yann@552
    34
@@ -82,6 +82,13 @@
yann@552
    35
 	[allow rebuilding of .class and .h files]))
yann@552
    36
 AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
yann@552
    37
 
yann@552
    38
+AC_ARG_ENABLE(libjava-multilib,
yann@552
    39
+	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
yann@552
    40
+if test "$enable_libjava_multilib" = no; then
yann@552
    41
+  multilib=no
yann@552
    42
+  ac_configure_args="$ac_configure_args --disable-multilib"
yann@552
    43
+fi
yann@552
    44
+
yann@552
    45
 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
yann@552
    46
 GCC_NO_EXECUTABLES
yann@552
    47