patches/gcc/4.3.1/120-java-nomulti.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
parent 746 b150d6f590fc
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd)
yann@552
     1
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/03_all_gcc43-java-nomulti.patch
yann@552
     2
diff -durN gcc-4.3.1.orig/libjava/configure gcc-4.3.1/libjava/configure
yann@552
     3
--- gcc-4.3.1.orig/libjava/configure	2008-06-06 16:49:11.000000000 +0200
yann@552
     4
+++ gcc-4.3.1/libjava/configure	2008-06-10 14:57:38.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.1.orig/libjava/configure.ac gcc-4.3.1/libjava/configure.ac
yann@552
    32
--- gcc-4.3.1.orig/libjava/configure.ac	2007-12-22 16:48:46.000000000 +0100
yann@552
    33
+++ gcc-4.3.1/libjava/configure.ac	2008-06-10 14:57:38.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