patches/gcc/4.3.5/420-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)
yann@2672
     1
Highly inspired by:
yann@2672
     2
  http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
yann@2672
     3
yann@2672
     4
diff -durN gcc-4.3.2.orig//libgcc/Makefile.in gcc-4.3.2/libgcc/Makefile.in
yann@2672
     5
--- gcc-4.3.2.orig//libgcc/Makefile.in	2008-06-17 11:32:34.000000000 +0200
yann@2672
     6
+++ gcc-4.3.2/libgcc/Makefile.in	2011-09-02 12:27:39.296538955 +0200
yann@2672
     7
@@ -705,8 +705,9 @@
yann@2672
     8
 libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
yann@2672
     9
 endif
yann@2672
    10
 
yann@2672
    11
+all: libgcc_eh.a
yann@2672
    12
 ifeq ($(enable_shared),yes)
yann@2672
    13
-all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
yann@2672
    14
+all: libgcc_s$(SHLIB_EXT)
yann@2672
    15
 ifneq ($(LIBUNWIND),)
yann@2672
    16
 all: libunwind$(SHLIB_EXT)
yann@2672
    17
 endif
yann@2672
    18
@@ -875,10 +876,6 @@
yann@2672
    19
 install-shared:
yann@2672
    20
 	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
yann@2672
    21
 
yann@2672
    22
-	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
yann@2672
    23
-	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
yann@2672
    24
-	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
yann@2672
    25
-
yann@2672
    26
 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
yann@2672
    27
 		@shlib_base_name@,libgcc_s,$(subst \
yann@2672
    28
 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
yann@2672
    29
@@ -893,6 +890,10 @@
yann@2672
    30
 	chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
yann@2672
    31
 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
yann@2672
    32
 
yann@2672
    33
+	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
yann@2672
    34
+	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
yann@2672
    35
+	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
yann@2672
    36
+
yann@2672
    37
 	parts="$(INSTALL_PARTS)";				\
yann@2672
    38
 	for file in $$parts; do					\
yann@2672
    39
 	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\