commit: 1a5882abf01ae085e999ddcf4d208105e21e1a0d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jul 3 02:03:18 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jul 3 02:22:11 2022 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=1a5882ab
10.4.0, 11.3.0, 11.4.0, 12.1.0: add gettext/msgfmt libstdc++ patch Fixes building w/ USE=nls using a newer GCC. Bug: https://bugs.gentoo.org/843119 Signed-off-by: Sam James <sam <AT> gentoo.org> 10.4.0/gentoo/33_all_msgfmt-libstdc++-link.patch | 39 ++++++++++++++++++++++++ 10.4.0/gentoo/README.history | 3 ++ 11.3.0/gentoo/27_all_msgfmt-libstdc++-link.patch | 39 ++++++++++++++++++++++++ 11.3.0/gentoo/README.history | 3 ++ 11.4.0/gentoo/27_all_msgfmt-libstdc++-link.patch | 39 ++++++++++++++++++++++++ 11.4.0/gentoo/README.history | 3 ++ 12.1.0/gentoo/29_all_msgfmt-libstdc++-link.patch | 39 ++++++++++++++++++++++++ 12.1.0/gentoo/README.history | 3 ++ 8 files changed, 168 insertions(+) diff --git a/10.4.0/gentoo/33_all_msgfmt-libstdc++-link.patch b/10.4.0/gentoo/33_all_msgfmt-libstdc++-link.patch new file mode 100644 index 0000000..0d2f113 --- /dev/null +++ b/10.4.0/gentoo/33_all_msgfmt-libstdc++-link.patch @@ -0,0 +1,39 @@ +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 +https://bugs.gentoo.org/843119 +--- a/libstdc++-v3/po/Makefile.am ++++ b/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) +--- a/libstdc++-v3/po/Makefile.in ++++ b/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) diff --git a/10.4.0/gentoo/README.history b/10.4.0/gentoo/README.history index 7b129d1..0f6b049 100644 --- a/10.4.0/gentoo/README.history +++ b/10.4.0/gentoo/README.history @@ -1,3 +1,6 @@ +2 03 Jul 2022 + + 33_all_msgfmt-libstdc++-link.patch + 1 22 May 2022 U 22_all_libstdcxx-no-vtv.patch diff --git a/11.3.0/gentoo/27_all_msgfmt-libstdc++-link.patch b/11.3.0/gentoo/27_all_msgfmt-libstdc++-link.patch new file mode 100644 index 0000000..0d2f113 --- /dev/null +++ b/11.3.0/gentoo/27_all_msgfmt-libstdc++-link.patch @@ -0,0 +1,39 @@ +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 +https://bugs.gentoo.org/843119 +--- a/libstdc++-v3/po/Makefile.am ++++ b/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) +--- a/libstdc++-v3/po/Makefile.in ++++ b/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) diff --git a/11.3.0/gentoo/README.history b/11.3.0/gentoo/README.history index 850c02b..49c754f 100644 --- a/11.3.0/gentoo/README.history +++ b/11.3.0/gentoo/README.history @@ -1,3 +1,6 @@ +5 3 July 2022 + + 27_all_msgfmt-libstdc++-link.patch + 4 8 January 2022 + 76_all_all_PR103910_12_ICE-on-PCH.patch diff --git a/11.4.0/gentoo/27_all_msgfmt-libstdc++-link.patch b/11.4.0/gentoo/27_all_msgfmt-libstdc++-link.patch new file mode 100644 index 0000000..0d2f113 --- /dev/null +++ b/11.4.0/gentoo/27_all_msgfmt-libstdc++-link.patch @@ -0,0 +1,39 @@ +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 +https://bugs.gentoo.org/843119 +--- a/libstdc++-v3/po/Makefile.am ++++ b/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) +--- a/libstdc++-v3/po/Makefile.in ++++ b/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) diff --git a/11.4.0/gentoo/README.history b/11.4.0/gentoo/README.history index 7d9195d..695ab6a 100644 --- a/11.4.0/gentoo/README.history +++ b/11.4.0/gentoo/README.history @@ -1,3 +1,6 @@ +1 3 July 2022 + + 27_all_msgfmt-libstdc++-link.patch + 0 22 May 2022 + 01_all_default-fortify-source.patch + 02_all_default-warn-format-security.patch diff --git a/12.1.0/gentoo/29_all_msgfmt-libstdc++-link.patch b/12.1.0/gentoo/29_all_msgfmt-libstdc++-link.patch new file mode 100644 index 0000000..0d2f113 --- /dev/null +++ b/12.1.0/gentoo/29_all_msgfmt-libstdc++-link.patch @@ -0,0 +1,39 @@ +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 +https://bugs.gentoo.org/843119 +--- a/libstdc++-v3/po/Makefile.am ++++ b/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) +--- a/libstdc++-v3/po/Makefile.in ++++ b/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) diff --git a/12.1.0/gentoo/README.history b/12.1.0/gentoo/README.history index 04019c0..1602600 100644 --- a/12.1.0/gentoo/README.history +++ b/12.1.0/gentoo/README.history @@ -1,3 +1,6 @@ +9 3 Jul 2022 + + 29_all_msgfmt-libstdc++-link.patch + 8 26 Jun 2022 + 28_all_drop_CFLAGS_sed.patch
