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 48A7115800F for ; Mon, 30 Jan 2023 19:45:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C79FE098F; Mon, 30 Jan 2023 19:45:15 +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 5E393E098F for ; Mon, 30 Jan 2023 19:45:15 +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 59F72335D97 for ; Mon, 30 Jan 2023 19:45:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC9A675 for ; Mon, 30 Jan 2023 19:45:12 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1675107871.41811e6dccc06d1760e3ede11d638f01c947fef1.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/glibc/glibc-2.36-r5.ebuild X-VCS-Directories: sys-libs/glibc/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 41811e6dccc06d1760e3ede11d638f01c947fef1 X-VCS-Branch: master Date: Mon, 30 Jan 2023 19:45:12 +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: c37aea27-0536-4f85-b2bf-88706aa5e254 X-Archives-Hash: d8905dc120fd40f31ec81b758d919c2f commit: 41811e6dccc06d1760e3ede11d638f01c947fef1 Author: James Le Cuirot gentoo org> AuthorDate: Mon Jan 30 19:44:31 2023 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Mon Jan 30 19:44:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41811e6d sys-libs/glibc: Backport prefix sysroot change to stable version Sorry for changing the stable version, but I forgot to consider stable before publishing the news item. This only affects prefix anyway. Signed-off-by: James Le Cuirot gentoo.org> sys-libs/glibc/glibc-2.36-r5.ebuild | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys-libs/glibc/glibc-2.36-r5.ebuild b/sys-libs/glibc/glibc-2.36-r5.ebuild index ed09d00c8a98..5aa15579a204 100644 --- a/sys-libs/glibc/glibc-2.36-r5.ebuild +++ b/sys-libs/glibc/glibc-2.36-r5.ebuild @@ -1306,6 +1306,17 @@ glibc_do_src_install() { mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die fi + # We configure toolchains for standalone prefix systems with a sysroot, + # which is prepended to paths in ld scripts, so strip the prefix from these. + # Before: GROUP ( /foo/lib64/libc.so.6 /foo/usr/lib64/libc_nonshared.a AS_NEEDED ( /foo/lib64/ld-linux-x86-64.so.2 ) ) + # After: GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) ) + if [[ -n $(host_eprefix) ]] ; then + local file + grep -lZIF "ld script" "${ED}/$(alt_usrlibdir)"/lib*.{a,so} 2>/dev/null | while read -rd '' file ; do + sed -i "s|$(host_eprefix)/|/|g" "${file}" || die + done + fi + # We'll take care of the cache ourselves rm -f "${ED}"/etc/ld.so.cache