From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A0472158020 for ; Sat, 17 Dec 2022 04:54:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1872E088F; Sat, 17 Dec 2022 04:54:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6500E088F for ; Sat, 17 Dec 2022 04:54:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9ECC73411A5 for ; Sat, 17 Dec 2022 04:54:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D805A7D6 for ; Sat, 17 Dec 2022 04:54:10 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1671252845.80a7f6e8b46af67631ea07059bfa3d460f4c493e.sam@gentoo> Subject: [gentoo-commits] proj/gcc-patches:master commit in: 13.1.0/gentoo/ X-VCS-Repository: proj/gcc-patches X-VCS-Files: 13.1.0/gentoo/30_all_tar_libstdc++-link.patch 13.1.0/gentoo/README.history X-VCS-Directories: 13.1.0/gentoo/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 80a7f6e8b46af67631ea07059bfa3d460f4c493e X-VCS-Branch: master Date: Sat, 17 Dec 2022 04:54:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2eae62c3-b3e3-4879-a893-231f5ad83d83 X-Archives-Hash: 96937939f111167173c45732e2f65afe commit: 80a7f6e8b46af67631ea07059bfa3d460f4c493e Author: Sam James gentoo org> AuthorDate: Sat Dec 17 03:11:33 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Dec 17 04:54:05 2022 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=80a7f6e8 13.1.0: add 30_all_tar_libstdc++-link.patch Bug: https://bugs.gentoo.org/886447 Signed-off-by: Sam James gentoo.org> 13.1.0/gentoo/30_all_tar_libstdc++-link.patch | 54 +++++++++++++++++++++++++++ 13.1.0/gentoo/README.history | 3 ++ 2 files changed, 57 insertions(+) diff --git a/13.1.0/gentoo/30_all_tar_libstdc++-link.patch b/13.1.0/gentoo/30_all_tar_libstdc++-link.patch new file mode 100644 index 0000000..3dd94f8 --- /dev/null +++ b/13.1.0/gentoo/30_all_tar_libstdc++-link.patch @@ -0,0 +1,54 @@ +From eae11e896edef4199a128bf6720b5bd4e5edc2f9 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 17 Dec 2022 02:42:59 +0000 +Subject: [PATCH] Fix calling libarchive's tar + +https://bugs.gentoo.org/886447 + +Very similar to 33_all_msgfmt-libstdc++-link.patch, whose description is: +""" +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 +""" + +Signed-off-by: Sam James +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -3957,9 +3957,9 @@ install-headers-tar: stmp-int-hdrs install-include-dir + # Unless a full pathname is provided, some shells would print the new CWD, + # found in CDPATH, corrupting the output. We could just redirect the + # output of `cd', but some shells lose on redirection within `()'s +- (cd `${PWD_COMMAND}`/include ; \ ++ (unset LD_LIBRARY_PATH ; cd `${PWD_COMMAND}`/include ; \ + tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include; tar xpf - ) +- (cd `${PWD_COMMAND}`/include-fixed ; \ ++ (unset LD_LIBRARY_PATH ; cd `${PWD_COMMAND}`/include-fixed ; \ + tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include-fixed; tar xpf - ) + # /bin/sh on some systems returns the status of the first tar, + # and that can lose with GNU tar which always writes a full block. +@@ -3981,7 +3981,7 @@ install-headers-cp: stmp-int-hdrs install-include-dir + # Targets without dependencies, for use in prev-gcc during bootstrap. + real-install-headers-tar: + (cd `${PWD_COMMAND}`/include-fixed ; \ +- tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include-fixed; tar xpf - ) ++ unset LD_LIBRARY_PATH; tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include-fixed; unset LD_LIBRARY_PATH; tar xpf - ) + + real-install-headers-cpio: + cd `${PWD_COMMAND}`/include-fixed ; \ diff --git a/13.1.0/gentoo/README.history b/13.1.0/gentoo/README.history index fcd7f8b..b56b51e 100644 --- a/13.1.0/gentoo/README.history +++ b/13.1.0/gentoo/README.history @@ -1,3 +1,6 @@ +4 17 Dec 2022 + + 30_all_tar_libstdc++-link.patch + 3 29 November 2022 - 23_all_EXTRA_OPTIONS-z-now.patch