gentoo auto-resync : 25:06:2024 - 00:12:20

5 files changed, 36 insertions, 24 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index b659924353ba..ed9a321722d5 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -51,8 +51,8 @@ EBUILD glibc-2.35-r11.ebuild 50194 BLAKE2B d1fb2a06d6dc89505c23d79bfb2af4eba67d8
 EBUILD glibc-2.36-r8.ebuild 52472 BLAKE2B aabb6ac48125f43726e4aa68ca9f82f73e348ec1341dc16dce2fa7c27c1565daf96ec9ca5be64ced1668543698d3870e9dc0f08d1eb45f6f7923e13a8e29c429 SHA512 40bd2c57454756bc4187f45b81eb15adf2f6e831147d324e5efa47e64c33133a35bd0a0fabbe2d379c64d715ec4cc6b3e32ee76a6975fb0d0914831cbf0a2cf1
 EBUILD glibc-2.37-r10.ebuild 53001 BLAKE2B cd9831be3a13f887777a31604d2f07182f1059ad20604c71dde40b312e665ed9e356b1196e6a0b3d12e30b4a4d8769281b273e3f465449d99d6648256acfebcf SHA512 dab7115f2249248d43003bfdd107bc1231315f14a2f1180bb6fafcb862e3558c75d13a3702fc38d57b87bb58f51c794aa8093fb29a529105b8e87c3a4ee5d71c
 EBUILD glibc-2.38-r13.ebuild 54707 BLAKE2B f1418b6bb2a438c65520cdd3e48723a1f3d0e9845b379e54368a98a0b907a9b2a061b2796e4f98430a477632646d3eab05c673397e1d28bb2c4501c43e249371 SHA512 6506084a6b51d6dbfb485dce760018ddd45f91957f502a12f60d683f4da050685f8c9ac0441a4267767972a8a891cf790a1f3838109e99b87052a965b6a786e3
-EBUILD glibc-2.39-r6.ebuild 54641 BLAKE2B 05c977c24036ec4c9d4e5edc169fa5e136f1ab942ac7ab0e34901e44731bf48e5e47a01351d3a48dddeccad76a372a63aa947885666eded5c7b6bc3fad9c04e6 SHA512 87fb72527d36b25657e48391893a9060ca29c90580add1d20d3a809e9dff5886ae5b3cf1e0f00a1d4a74a4311bee2027c820a75f1a8820b10a60f8ee37c77b27
-EBUILD glibc-2.39-r7.ebuild 54648 BLAKE2B 6196725eaff7a806f528d34513620e8a048fee9cd7f4418141d11f61c1dc4da30f8a4366a393c51020031b4efcc47f5017cef375f6fc1b8803821872b5e96490 SHA512 162c39bb7867b1d9c94448344dfb12932bbe47b41b6460c3741c0009f92ad7f8c877f79ecbab00686e67630d496a15983b7ae4ec19a91895596fafe80e4efccf
-EBUILD glibc-2.39-r9.ebuild 54242 BLAKE2B bdc8710294cae184714e154ddc47e6971596bde88d4ea5472a828a08589bc603ae0874b1cbce761ac58b45df22a813f17c7492606ece11e8bfa3cde8c5ae1293 SHA512 36f38dc36792fdb844b2ce3178ca5b79378ee69a01077b1a7f36403dee9aef5fb0b1acc0dd84d31dba604f768d361952da821910119581a8efe57ffc21c8f524
-EBUILD glibc-9999.ebuild 54245 BLAKE2B eeca843a176cec1705420685daef9a55c647986aef6f2107340151d9164291af04280e17ab02a72330976f6c5bc7a7f6b8e01c99a5c6dad90787028d5bcd0fac SHA512 3ffb8142d41e1b5bc3cd8d928fda18e655ce25f49c9ea818655ee03d2c67928a34d36c7d5d28cd6bd3983665c1982997294250a6714e0bb6fdbbb83d6a234f37
+EBUILD glibc-2.39-r6.ebuild 54692 BLAKE2B c6295250c58c5d52fe83ddb17bff5209008396e846da10c1ce7f5ed141e07ce2d0dbb0f526cde3fca36d8c9f8e6173dfff3f2fd602df0fef7a8f37865cca1687 SHA512 6d9012d4b0aad9634d88fb82b7e5e5b5c6aab4fd2a02db770b19a75531b7581dca6c402c3c39c877c25ab8352655a3930eb853cef9c11c41bfb08dba10d8a1e1
+EBUILD glibc-2.39-r7.ebuild 54699 BLAKE2B ad449414d7097e235f52e56dff22cbb9a89d9888c38d206ff9f7b037407cde387f5fe74ac7e2c7f02603df3c8e3b3a7af6840880e9ff8d8afb0eb932731e9c52 SHA512 04687c75d2d9f6137df674d7ddbdb37bbfbcb2c7abe097cb35485a86af6f2b905da342f5af2d55a9203e36b7c51c4f9c19009a08406b5a276e1839ca563cd41b
+EBUILD glibc-2.39-r9.ebuild 54293 BLAKE2B bdf978ee6d6422a43f0be4bb9cc71af8909c81fb689c9a7b68bafb8f4082fbaeee0c1494c97c396ed2eb263c2a53669ce1c647c4fa87c46c43888717f7310483 SHA512 7397e61ea25619d4774eeb1b6a2c54b002c71c909d21a0b91943c9c5573f2d751c3270a224ea8136208c48191314cf09c1a7e3b20c0ae9f65c0fe1dfa1d7c9ad
+EBUILD glibc-9999.ebuild 54296 BLAKE2B 0ec7bdb666e64908fc37e638000ced8ccc841382bb350091e81101cddea03e611eefa4bb0a64d30ee42d3c3a3d8121350406995d32bc6fbeae0806eae8d24df1 SHA512 23afaac7e3b6b50aef10ec5055dcea51adecdaf81a71deeb3473fb52f66f20b48660ca5a438e3fe2990f7673aebc15d48e6c018574bb8bef5905309fe6cbd597
 MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
diff --git a/sys-libs/glibc/glibc-2.39-r6.ebuild b/sys-libs/glibc/glibc-2.39-r6.ebuild
index 6772a8cdcc8b..d4820cc75723 100644
--- a/sys-libs/glibc/glibc-2.39-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.39-r6.ebuild
@@ -522,11 +522,14 @@ setup_flags() {
 	# dealing with CET in ld.so. So if CET is supposed to be
 	# disabled for glibc, be explicit about it.
 	if ! use cet; then
-		if use amd64 || use x86; then
-			append-flags '-fcf-protection=none'
-		elif use arm64; then
-			append-flags '-mbranch-protection=none'
-		fi
+		case ${ABI}-${CTARGET} in
+			amd64-x86_64-*|x32-x86_64-*-*-gnux32)
+				append-flags '-fcf-protection=none'
+				;;
+			arm64-aarch64*)
+				append-flags '-mbranch-protection=none'
+				;;
+		esac
 	fi
 }
 
diff --git a/sys-libs/glibc/glibc-2.39-r7.ebuild b/sys-libs/glibc/glibc-2.39-r7.ebuild
index ceafcc6e5084..90f211bebf68 100644
--- a/sys-libs/glibc/glibc-2.39-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.39-r7.ebuild
@@ -522,11 +522,14 @@ setup_flags() {
 	# dealing with CET in ld.so. So if CET is supposed to be
 	# disabled for glibc, be explicit about it.
 	if ! use cet; then
-		if use amd64 || use x86; then
-			append-flags '-fcf-protection=none'
-		elif use arm64; then
-			append-flags '-mbranch-protection=none'
-		fi
+		case ${ABI}-${CTARGET} in
+			amd64-x86_64-*|x32-x86_64-*-*-gnux32)
+				append-flags '-fcf-protection=none'
+				;;
+			arm64-aarch64*)
+				append-flags '-mbranch-protection=none'
+				;;
+		esac
 	fi
 }
 
diff --git a/sys-libs/glibc/glibc-2.39-r9.ebuild b/sys-libs/glibc/glibc-2.39-r9.ebuild
index e6650fa8057d..da579ed2837b 100644
--- a/sys-libs/glibc/glibc-2.39-r9.ebuild
+++ b/sys-libs/glibc/glibc-2.39-r9.ebuild
@@ -515,11 +515,14 @@ setup_flags() {
 	# dealing with CET in ld.so. So if CET is supposed to be
 	# disabled for glibc, be explicit about it.
 	if ! use cet; then
-		if use amd64 || use x86; then
-			append-flags '-fcf-protection=none'
-		elif use arm64; then
-			append-flags '-mbranch-protection=none'
-		fi
+		case ${ABI}-${CTARGET} in
+			amd64-x86_64-*|x32-x86_64-*-*-gnux32)
+				append-flags '-fcf-protection=none'
+				;;
+			arm64-aarch64*)
+				append-flags '-mbranch-protection=none'
+				;;
+		esac
 	fi
 }
 
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 270b0a868557..a1512de95b17 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -515,11 +515,14 @@ setup_flags() {
 	# dealing with CET in ld.so. So if CET is supposed to be
 	# disabled for glibc, be explicit about it.
 	if ! use cet; then
-		if use amd64 || use x86; then
-			append-flags '-fcf-protection=none'
-		elif use arm64; then
-			append-flags '-mbranch-protection=none'
-		fi
+		case ${ABI}-${CTARGET} in
+			amd64-x86_64-*|x32-x86_64-*-*-gnux32)
+				append-flags '-fcf-protection=none'
+				;;
+			arm64-aarch64*)
+				append-flags '-mbranch-protection=none'
+				;;
+		esac
 	fi
 }