gentoo auto-resync : 29:01:2023 - 02:53:24

4 files changed, 36 insertions, 3 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index b0a863371bb7..9d81c742df11 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -42,7 +42,7 @@ EBUILD glibc-2.33-r14.ebuild 48640 BLAKE2B a8be6903094275c6b68af5eb997ecf9824edd
 EBUILD glibc-2.34-r14.ebuild 49635 BLAKE2B b9e39255651ebda4cf2fff8ff9e6e0470955ed04559fc78a20bdcdcaf1a1ac7a188157798bb23feef4d52c393f36fe3e2dc85e4fd0d4d256c7d9a399431ad7e5 SHA512 351c113b723f492cb74ae1178e3769a7775bf5660ec1a69fc7d779ee48d060c48e690b101fa4880b55d9105e4488f6a9b46e5c4b23484bf02d2448db74414a86
 EBUILD glibc-2.35-r11.ebuild 50176 BLAKE2B a7999672c0039cb7ef79fd84b13ea7d8d752adeb185eac0744383f514b0897ad8b7518c9ea8392b8f4217ec0873f2d4b9e56bd1424378c83c2dd98122b2caf7d SHA512 bf7d103bb91722cd61720290bf38c6cb73d8d199e6479e35ab017de83006826b014c49d6dc0188cd3f4aaf906578ee4ae9f851d37346a4d9a228bee683930bfa
 EBUILD glibc-2.36-r5.ebuild 50776 BLAKE2B 941d7227f97f3b40f4940f6b791c4edfb96fad11372956221087e617f5db911477744a94af2a74e0d904e67dd1c277080117af1a57813787e43d6b269cbba5ca SHA512 2aa182a93210851f63ec9cd166b367fd00543752f96ddf01bfab9b373ee4bc75ff2a14e2ef7a2cdcc46776e16c1ddddd6f1749705bc7eddddb9392d34c9c702d
-EBUILD glibc-2.36-r6.ebuild 51211 BLAKE2B c3068112c6fdfdec604eda6c4bd12edeeeda2a39ae5b80f49e2c241b1691b53a42cb64d0aaec645f4bf9f9c540b8d481fcfd157480521223d51a69ec74cd0b89 SHA512 14c227b102305b7684d67c460e75a50d8261bc288996dacc99e24eabe8ba85c991ba4ad5d4ffbf63bb3065d0ed53220ed68b08ddb95283975ffef35d9231cd0c
-EBUILD glibc-2.36-r7.ebuild 51211 BLAKE2B 9f831c3c41797211c6d308680f74e2d327ab7acf1101327300fcd1d6ea1d5c07ed53709e559736d279b5d8b6d9f7c6350874a90d11d8366c484faf41d5254cf2 SHA512 e3550dbd1cf0a15aa5aff0d15ca2a685bbe00b8bd2c15116f2d20a66d8de0b5db0d7d5d363586357d1f97d5c099d3e67a66cf58b33e4adddb57df36949398631
-EBUILD glibc-9999.ebuild 51347 BLAKE2B 9b518069136a2a7ee7482cb4459e2456bd6299dadced3d14c8e04d1d2a62ba400a1a7f6bb7f22c7f66c1ca719e624420d86faa5ceb18c80f812e9138f39d4174 SHA512 03579d6c504e4835923e04bc881dd96b038799d3adb2491522055ae1c63faf465a8a7d3fa21b4591b57b980200e5f4ba26f4686add872d42534101397996a22f
+EBUILD glibc-2.36-r6.ebuild 51808 BLAKE2B d31f5b3474e5ddca55c186171debe86df8d66941f702753e2c1b4e99cc25a4aedfb262c9fb4aba0a877b662f0b4b213f532c7094dd7213a37c1ba9fe084a79aa SHA512 d22239be8c809e22ecaa14b190c160433d33c0d8ee409201e7c78ec533ae9ca50a276f9d28da7e56846775e8b8876ac008608e5da5b2d3941eea8e032d8700af
+EBUILD glibc-2.36-r7.ebuild 51808 BLAKE2B af462347544c829c48110bb8f270480d0b6659382a4badfe8598ea73a77d20cfdea3d10926c100f00dccd61f7427ce7ae78c035ec05131cfb81e29be40fd3e41 SHA512 3e61a884f05c6c39cf7f1864dacc2bfea634fa2379b89f2cf1d8e60fad913cd1290e60fdb3fb5fd5559842d9fef663851a968f5656fda6abfbacf3ed052a3399
+EBUILD glibc-9999.ebuild 51944 BLAKE2B 49b3f74c314a7c2cff2d5f1f8100b89d788824f076ddd91775e796e0d91d95cceb42552b68c2343baf36bc5638fd70ce7a148f0254abd5169e8db48a4a960f61 SHA512 a433c5b9fc081104bcf987c32e853b36c739813a4cb7ae02d43fac26a829857e408594e52d1ea72035107c7a96aa285e1798a4323c72bf459d6a261feb2f143d
 MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
diff --git a/sys-libs/glibc/glibc-2.36-r6.ebuild b/sys-libs/glibc/glibc-2.36-r6.ebuild
index be82be429c8f..e86bbd923123 100644
--- a/sys-libs/glibc/glibc-2.36-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.36-r6.ebuild
@@ -1314,6 +1314,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
 
diff --git a/sys-libs/glibc/glibc-2.36-r7.ebuild b/sys-libs/glibc/glibc-2.36-r7.ebuild
index 7071aab6c547..6f93ac1992b1 100644
--- a/sys-libs/glibc/glibc-2.36-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.36-r7.ebuild
@@ -1314,6 +1314,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
 
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 413594ad57c4..23a25b3e5e13 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1317,6 +1317,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