patches/gcc/4.3.1/190-libstdc++-pic.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/54_all_300-libstdc++-pic.patch
yann@552
     2
install libstdc++_pic.a if we have pic objs
yann@552
     3
yann@552
     4
diff -durN gcc-4.3.1.orig/libstdc++-v3/src/Makefile.am gcc-4.3.1/libstdc++-v3/src/Makefile.am
yann@552
     5
--- gcc-4.3.1.orig/libstdc++-v3/src/Makefile.am	2008-02-29 19:26:50.000000000 +0100
yann@552
     6
+++ gcc-4.3.1/libstdc++-v3/src/Makefile.am	2008-06-10 14:58:09.000000000 +0200
yann@552
     7
@@ -289,6 +289,13 @@
yann@552
     8
 	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
yann@552
     9
 
yann@552
    10
 
yann@552
    11
+install-exec-local:
yann@552
    12
+	pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
yann@552
    13
+	if [ x"$$pic_objs" != x ]; then \
yann@552
    14
+		$(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
yann@552
    15
+		$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
yann@552
    16
+	fi
yann@552
    17
+
yann@552
    18
 # Added bits to build debug library.
yann@552
    19
 if GLIBCXX_BUILD_DEBUG
yann@552
    20
 all-local: build_debug
yann@552
    21
diff -durN gcc-4.3.1.orig/libstdc++-v3/src/Makefile.in gcc-4.3.1/libstdc++-v3/src/Makefile.in
yann@552
    22
--- gcc-4.3.1.orig/libstdc++-v3/src/Makefile.in	2008-02-29 19:26:50.000000000 +0100
yann@552
    23
+++ gcc-4.3.1/libstdc++-v3/src/Makefile.in	2008-06-10 14:58:09.000000000 +0200
yann@552
    24
@@ -693,7 +693,7 @@
yann@552
    25
 
yann@552
    26
 install-data-am: install-data-local
yann@552
    27
 
yann@552
    28
-install-exec-am: install-toolexeclibLTLIBRARIES
yann@552
    29
+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
yann@552
    30
 
yann@552
    31
 install-info: install-info-am
yann@552
    32
 
yann@552
    33
@@ -732,7 +732,7 @@
yann@552
    34
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
yann@552
    35
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
yann@552
    36
 	tags uninstall uninstall-am uninstall-info-am \
yann@552
    37
-	uninstall-toolexeclibLTLIBRARIES
yann@552
    38
+	uninstall-toolexeclibLTLIBRARIES install-exec-local
yann@552
    39
 
yann@552
    40
 
yann@552
    41
 # Symbol versioning for shared libraries.
yann@552
    42
@@ -858,6 +858,14 @@
yann@552
    43
 install_debug:
yann@552
    44
 	(cd ${debugdir} && $(MAKE) \
yann@552
    45
 	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
yann@552
    46
+
yann@552
    47
+install-exec-local:
yann@552
    48
+	pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
yann@552
    49
+	if [ x"$$pic_objs" != x ]; then \
yann@552
    50
+		$(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
yann@552
    51
+		$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
yann@552
    52
+	fi
yann@552
    53
+
yann@552
    54
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
yann@552
    55
 # Otherwise a system limit (for SysV at least) may be exceeded.
yann@552
    56
 .NOEXPORT: