patches/binutils/2.18a/110-enable-dash-v2.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 804 c057564b1969
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@804
     1
Enable using a shell other than bash.
yann@804
     2
Courtesy "Martin Guy" <martinwguy@yahoo.it>
yann@804
     3
http://sourceware.org/ml/crossgcc/2008-08/msg00037.html
yann@804
     4
yann@804
     5
--- binutils-2.18.orig/ld/genscripts.sh	2007-08-12 20:00:07.000000000 +0100
yann@804
     6
+++ binutils-2.18/ld/genscripts.sh	2008-08-25 16:09:54.000000000 +0100
yann@804
     7
@@ -398,9 +398,11 @@
yann@804
     8
     . $em_script
yann@804
     9
     em_script=$current_script
yann@804
    10
   }
yann@804
    11
-  fragment()
yann@804
    12
+  
yann@804
    13
+  alias fragment='em_lineno=$LINENO; fragment_em'
yann@804
    14
+  fragment_em()
yann@804
    15
   {
yann@804
    16
-    local lineno=$[${BASH_LINENO[0]} + 1]
yann@804
    17
+    local lineno=$[$em_lineno + 1]
yann@804
    18
     echo >> e${EMULATION_NAME}.c "#line $lineno \"$em_script\""
yann@804
    19
     cat >> e${EMULATION_NAME}.c
yann@804
    20
   }