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