patches/gcc/4.2.1/310-libgcc_eh.a.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
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)
     1 Vampirised from:
     2   http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
     3 
     4 diff -durN gcc-4.2.2.orig/gcc/mklibgcc.in gcc-4.2.2/gcc/mklibgcc.in
     5 --- gcc-4.2.2.orig/gcc/mklibgcc.in	2006-07-04 22:20:01.000000000 +0200
     6 +++ gcc-4.2.2/gcc/mklibgcc.in	2011-08-31 16:24:03.674690016 +0200
     7 @@ -223,8 +223,8 @@
     8    if [ "$LIBUNWIND" ]; then
     9      libunwind_a=$dir/libunwind.a
    10    fi
    11 +  libgcc_eh_a=$dir/libgcc_eh.a
    12    if [ "$SHLIB_LINK" ]; then
    13 -    libgcc_eh_a=$dir/libgcc_eh.a
    14      libgcc_s_so=$dir/libgcc_s${SHLIB_EXT}
    15      if [ "$LIBUNWIND" ]; then
    16        libunwind_so=$dir/libunwind${SHLIB_EXT}
    17 @@ -889,11 +889,11 @@
    18    echo '	chmod 644'  ${ldir}/libgcov.a
    19    echo '	$(RANLIB_FOR_TARGET)' ${ldir}/libgcov.a
    20  
    21 -  if [ "$SHLIB_LINK" ]; then
    22 -    echo '	$(INSTALL_DATA)' ${dir}/libgcc_eh.a ${ldir}/
    23 -    echo '	chmod 644'  ${ldir}/libgcc_eh.a
    24 -    echo '	$(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a
    25 +  echo '	$(INSTALL_DATA)' ${dir}/libgcc_eh.a ${ldir}/
    26 +  echo '	chmod 644'  ${ldir}/libgcc_eh.a
    27 +  echo '	$(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a
    28  
    29 +  if [ "$SHLIB_LINK" ]; then
    30      shlib_slibdir_qual=
    31      os_multilib_dir=`$GCC_FOR_TARGET $flags --print-multi-os-directory`
    32      if [ "$os_multilib_dir" != . ]; then