patches/gcc/4.5.2/110-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 Highly inspired by:
     2   http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
     3 
     4 diff -durN gcc-4.5.0.orig/libgcc/Makefile.in gcc-4.5.0/libgcc/Makefile.in
     5 --- gcc-4.5.0.orig/libgcc/Makefile.in	2010-03-30 15:08:52.000000000 +0200
     6 +++ gcc-4.5.0/libgcc/Makefile.in	2011-09-12 17:46:51.342800731 +0200
     7 @@ -765,8 +765,9 @@
     8  libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
     9  endif
    10  
    11 +all: libgcc_eh.a
    12  ifeq ($(enable_shared),yes)
    13 -all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
    14 +all: libgcc_s$(SHLIB_EXT)
    15  ifneq ($(LIBUNWIND),)
    16  all: libunwind$(SHLIB_EXT)
    17  endif
    18 @@ -935,10 +936,6 @@
    19  install-shared:
    20  	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
    21  
    22 -	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
    23 -	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
    24 -	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
    25 -
    26  	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
    27  		@shlib_base_name@,libgcc_s,$(subst \
    28  		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
    29 @@ -953,6 +950,10 @@
    30  	chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
    31  	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
    32  
    33 +	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
    34 +	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
    35 +	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
    36 +
    37  	parts="$(INSTALL_PARTS)";				\
    38  	for file in $$parts; do					\
    39  	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\