gentoo auto-resync : 13:10:2022 - 19:42:47

5 files changed, 42 insertions, 19 deletions

diff --git a/sys-devel/lld-toolchain-symlinks/Manifest b/sys-devel/lld-toolchain-symlinks/Manifest
index ab73405c87f0..32aeb6cac174 100644
--- a/sys-devel/lld-toolchain-symlinks/Manifest
+++ b/sys-devel/lld-toolchain-symlinks/Manifest
@@ -1,4 +1,4 @@
-EBUILD lld-toolchain-symlinks-14.ebuild 704 BLAKE2B 5376b8dfec0b1ee11dda47aa926251777650584cb2a94bade825d98c1744438863da9a6ad2241e0e66a9571d28d21d68efbe29390a24259b8fe697031ed3a8b9 SHA512 90818f456b5eff65ae0c42dded617f099f23952b98ef2e0c825d8a8632b31609ba86f7caed0b1de6ae6f37319b0f9eb0ecd65b25cbfecc6fd68584c6ae61432f
-EBUILD lld-toolchain-symlinks-15.ebuild 704 BLAKE2B 5376b8dfec0b1ee11dda47aa926251777650584cb2a94bade825d98c1744438863da9a6ad2241e0e66a9571d28d21d68efbe29390a24259b8fe697031ed3a8b9 SHA512 90818f456b5eff65ae0c42dded617f099f23952b98ef2e0c825d8a8632b31609ba86f7caed0b1de6ae6f37319b0f9eb0ecd65b25cbfecc6fd68584c6ae61432f
-EBUILD lld-toolchain-symlinks-16.ebuild 680 BLAKE2B aabdf13fea2015a33d328124c006898af026ebeb9fffa57bdcf6804843b7e3b7202b5686ab95b8861d58fe1760a6b968acb997473f4f6cab0860e987091b54bb SHA512 472d11b11123c0d7da0c4f023c59c60734989db39660558a983f25ed06217d11a8e0da316c257dd3df48b6667367638bdd75c6d6ca3167ee39ff1de5b796827e
-MISC metadata.xml 563 BLAKE2B 112eb290a6af8d9bebf920d0ef9fc3cee28bc5d179176860fb27f069437fa0979b129890f694846e568eaa0ba17b7d4ee4d714bfcb2145425a5af5dd7edba65a SHA512 73f1a843d9281edc1a9697b6578d82fdbfb7c4cc30087786be98478cc27195594eee0b95a175be67b0cc8424d35a075934e0696b89b22f7cea561272b1898688
+EBUILD lld-toolchain-symlinks-14-r1.ebuild 825 BLAKE2B df81d2b414d0e924a20296f2a8eceb49b81a3763b89558a40f47b5a66e76f685656d6c8bd06c4ec21ee6e5c14f70fae40db1c966eb8ce3e11f55ca611ed7cb1e SHA512 a456988c082fa942248aeeb60aac4a4784396fcfd1096c911a8d6449185774d360d0ebf28262510642157c8a59efc6e612ee3a053d2ad233a54ce9a108dfcdba
+EBUILD lld-toolchain-symlinks-15-r1.ebuild 825 BLAKE2B df81d2b414d0e924a20296f2a8eceb49b81a3763b89558a40f47b5a66e76f685656d6c8bd06c4ec21ee6e5c14f70fae40db1c966eb8ce3e11f55ca611ed7cb1e SHA512 a456988c082fa942248aeeb60aac4a4784396fcfd1096c911a8d6449185774d360d0ebf28262510642157c8a59efc6e612ee3a053d2ad233a54ce9a108dfcdba
+EBUILD lld-toolchain-symlinks-16-r1.ebuild 801 BLAKE2B a539e9788b4cf4a758a5bd7209e69ff5b664029dac6bb3f4c0323efc4926d6e1de0c662d6361b8dfae4f45ee254ba559b0095f95bbc23404b28bd31a8b576073 SHA512 9e5ee806aa46d0d4b8ef2af27fac32ac146d12df5223a3b4b613400d2a47306068ebd8c9474c7b2f030d2e3d3fa1a309427afc03f096e60df04afe54ac0e1996
+MISC metadata.xml 784 BLAKE2B 044eebb87ddac511186e137d9e255cb3ead2d53aeffafc641cc9a53556b833f06cae439907de8e8ead1090d54f7cc4bcacdbfff52449b6fab5908aa6d354a110 SHA512 50a9ac94efe64f8f6533049f496a19c37e375803ea3920a3729c93f346117ea5b662978570db27e8fffcfaf78f990691c4ab5aaf7dd48a7e2931f713eddedb4b
diff --git a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-14.ebuild b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-14-r1.ebuild
index 75ee3dd007f7..c1a6e31f926c 100644
--- a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-14.ebuild
+++ b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-14-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}
 LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+native-symlinks"
+IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
 	sys-devel/lld
@@ -22,12 +22,18 @@ RDEPEND="
 src_install() {
 	use native-symlinks || return
 
-	local abi
+	local chosts=( "${CHOST}" )
+	if use multilib-symlinks; then
+		local abi
+		for abi in $(get_all_abis); do
+			chosts+=( "$(get_abi_CHOST "${abi}")" )
+		done
+	fi
+
 	local dest=/usr/lib/llvm/${SLOT}/bin
 	dodir "${dest}"
 	dosym ../../../../bin/ld.lld "${dest}/ld"
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		dosym ../../../../bin/ld.lld "${dest}/${abi_chost}-ld"
+	for chost in "${chosts[@]}"; do
+		dosym ../../../../bin/ld.lld "${dest}/${chost}-ld"
 	done
 }
diff --git a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15.ebuild b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15-r1.ebuild
index 75ee3dd007f7..c1a6e31f926c 100644
--- a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15.ebuild
+++ b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}
 LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+native-symlinks"
+IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
 	sys-devel/lld
@@ -22,12 +22,18 @@ RDEPEND="
 src_install() {
 	use native-symlinks || return
 
-	local abi
+	local chosts=( "${CHOST}" )
+	if use multilib-symlinks; then
+		local abi
+		for abi in $(get_all_abis); do
+			chosts+=( "$(get_abi_CHOST "${abi}")" )
+		done
+	fi
+
 	local dest=/usr/lib/llvm/${SLOT}/bin
 	dodir "${dest}"
 	dosym ../../../../bin/ld.lld "${dest}/ld"
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		dosym ../../../../bin/ld.lld "${dest}/${abi_chost}-ld"
+	for chost in "${chosts[@]}"; do
+		dosym ../../../../bin/ld.lld "${dest}/${chost}-ld"
 	done
 }
diff --git a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16.ebuild b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r1.ebuild
index aefb59aafa0d..0fc37704b2b3 100644
--- a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16.ebuild
+++ b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS=""
 PROPERTIES="live"
-IUSE="+native-symlinks"
+IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
 	sys-devel/lld
@@ -23,12 +23,18 @@ RDEPEND="
 src_install() {
 	use native-symlinks || return
 
-	local abi
+	local chosts=( "${CHOST}" )
+	if use multilib-symlinks; then
+		local abi
+		for abi in $(get_all_abis); do
+			chosts+=( "$(get_abi_CHOST "${abi}")" )
+		done
+	fi
+
 	local dest=/usr/lib/llvm/${SLOT}/bin
 	dodir "${dest}"
 	dosym ../../../../bin/ld.lld "${dest}/ld"
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		dosym ../../../../bin/ld.lld "${dest}/${abi_chost}-ld"
+	for chost in "${chosts[@]}"; do
+		dosym ../../../../bin/ld.lld "${dest}/${chost}-ld"
 	done
 }
diff --git a/sys-devel/lld-toolchain-symlinks/metadata.xml b/sys-devel/lld-toolchain-symlinks/metadata.xml
index 1583779e583b..69ca87c01788 100644
--- a/sys-devel/lld-toolchain-symlinks/metadata.xml
+++ b/sys-devel/lld-toolchain-symlinks/metadata.xml
@@ -5,6 +5,11 @@
 		<email>llvm@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name="multilib-symlinks">
+			Install symlinks for all ABI CHOSTs. Note that this can
+			result in gcc being overrode for native builds, as well
+			as conflict with crossdev if used for the same targets.
+		</flag>
 		<flag name="native-symlinks">
 			Install generic 'ld' symlink, as well as ${CTARGET}-ld.
 			These symlinks are installed into slotted LLVM bindir,