[gentoo-commits] gentoo commit in src/patchsets/gcc/4.7.4/gentoo: 20_all_msgfmt-libstdc++-link.patch README.history

[gentoo-commits] gentoo commit in src/patchsets/gcc/4.7.4/gentoo: 20_all_msgfmt-libstdc++-link.patch README.history

[Ryan Hill (rhill)]

rhill       14/06/17 02:26:50

  Modified:             README.history
  Added:                20_all_msgfmt-libstdc++-link.patch
  Log:
  Add patch by Martin von Gagern for bug #372377.

Revision  Changes    Path
1.2                  src/patchsets/gcc/4.7.4/gentoo/README.history

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.7.4/gentoo/README.history?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.7.4/gentoo/README.history?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.7.4/gentoo/README.history?r1=1.1&r2=1.2

Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.7.4/gentoo/README.history,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.history	17 Jun 2014 01:47:24 -0000	1.1
+++ README.history	17 Jun 2014 02:26:50 -0000	1.2
@@ -7,6 +7,7 @@
 	+ 16_all_libgo-Werror-pr53679.patch
 	+ 17_all_libitm-Werror.patch
 	+ 18_all_libgcc-cross-canadian.patch
+	+ 20_all_msgfmt-libstdc++-link.patch
 	+ 25_all_alpha-mieee-default.patch
 	+ 26_all_alpha-asm-mcpu.patch
 	+ 29_all_arm_armv4t-default.patch



1.1                  src/patchsets/gcc/4.7.4/gentoo/20_all_msgfmt-libstdc++-link.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.7.4/gentoo/20_all_msgfmt-libstdc++-link.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.7.4/gentoo/20_all_msgfmt-libstdc++-link.patch?rev=1.1&content-type=text/plain

Index: 20_all_msgfmt-libstdc++-link.patch
===================================================================
Ensure that msgfmt doesn't encounter problems during gcc bootstrapping.

Solves error messages like the following:

msgfmt: /var/tmp/portage/sys-devel/gcc-4.1.2/work/build/./gcc/libgcc_s.so.1: version `GCC_4.2.0' not found (required by /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/libstdc++.so.6)

The libgcc_s.so used during build doesn't satisfy the needs of the
libstdc++.so that msgfmt is linked against. On the other hand, msgfmt
is used as a stand-alone application here, and what library it uses
behind the scenes is of no concern to the gcc build process.
Therefore, simply invoking it "as usual", i.e. without any special
library path, will make it work as expected here.

2011-09-19 Martin von Gagern

References:
https://bugs.gentoo.org/372377
https://bugs.gentoo.org/295480

--- gcc-4.1.2.orig/libstdc++-v3/po/Makefile.am
+++ gcc-4.1.2/libstdc++-v3/po/Makefile.am
@@ -39,6 +39,7 @@ MSGFMT = msgfmt
 EXTRA_DIST = string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN)
 
 .po.mo:
+	env --unset=LD_LIBRARY_PATH \
 	$(MSGFMT) -o $@ $<
 
 all-local: all-local-$(USE_NLS)
--- gcc-4.1.2.orig/libstdc++-v3/po/Makefile.in
+++ gcc-4.1.2/libstdc++-v3/po/Makefile.in
@@ -419,6 +419,7 @@ uninstall-am: uninstall-info-am
 
 
 .po.mo:
+	env --unset=LD_LIBRARY_PATH \
 	$(MSGFMT) -o $@ $<
 
 all-local: all-local-$(USE_NLS)