2022-08-13 15:17:36 +00:00
From 83bf2a316222e2fe0b72968cadf4e334d41173f6 Mon Sep 17 00:00:00 2001
2020-08-21 10:18:02 +00:00
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:50:33 +0000
2021-04-25 11:08:48 +00:00
Subject: [PATCH] Ensure that msgfmt doesn't encounter problems during gcc
bootstrapping.
2018-12-12 17:14:55 +00:00
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
2020-08-21 10:18:02 +00:00
---
libstdc++-v3/po/Makefile.am | 1 +
libstdc++-v3/po/Makefile.in | 1 +
2 files changed, 2 insertions(+)
2018-12-12 17:14:55 +00:00
2020-08-21 10:18:02 +00:00
diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
2022-08-13 15:17:36 +00:00
index 8f51544989e..5329804d136 100644
2020-08-21 10:18:02 +00:00
--- a/libstdc++-v3/po/Makefile.am
+++ b/libstdc++-v3/po/Makefile.am
@@ -38,6 +38,7 @@ MSGFMT = msgfmt
2018-12-12 17:14:55 +00:00
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)
2020-08-21 10:18:02 +00:00
diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
2022-08-13 15:17:36 +00:00
index 243f3db7b72..822210781fa 100644
2020-08-21 10:18:02 +00:00
--- a/libstdc++-v3/po/Makefile.in
+++ b/libstdc++-v3/po/Makefile.in
2022-08-13 15:17:36 +00:00
@@ -561,6 +561,7 @@ uninstall-am:
2018-12-12 17:14:55 +00:00
.po.mo:
+ env --unset=LD_LIBRARY_PATH \
$(MSGFMT) -o $@ $<
all-local: all-local-$(USE_NLS)