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 91FA6158020 for ; Thu, 13 Oct 2022 15:41:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C946AE089C; Thu, 13 Oct 2022 15:41:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADC92E089C for ; Thu, 13 Oct 2022 15:41:19 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C54F433BE68 for ; Thu, 13 Oct 2022 15:41:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18CB8608 for ; Thu, 13 Oct 2022 15:41:17 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1665675672.831fe6faf3f10d6ec9081dabe6c912ed910f43f8.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang-toolchain-symlinks/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-14-r1.ebuild sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-14-r2.ebuild sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r1.ebuild sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r1.ebuild sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild sys-devel/clang-toolchain-symlinks/metadata.xml X-VCS-Directories: sys-devel/clang-toolchain-symlinks/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 831fe6faf3f10d6ec9081dabe6c912ed910f43f8 X-VCS-Branch: master Date: Thu, 13 Oct 2022 15:41:17 +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: 39275558-7eb4-4fbd-a553-7fb57878b1e5 X-Archives-Hash: a3a6040cc711e73e34e075f528567fbb commit: 831fe6faf3f10d6ec9081dabe6c912ed910f43f8 Author: Michał Górny gentoo org> AuthorDate: Thu Oct 13 15:34:42 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Oct 13 15:41:12 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=831fe6fa sys-devel/clang-toolchain-symlinks: Do not multilib by default Bug: https://bugs.gentoo.org/876901 Signed-off-by: Michał Górny gentoo.org> ...-r1.ebuild => clang-toolchain-symlinks-14-r2.ebuild} | 17 ++++++++++++----- ...-r1.ebuild => clang-toolchain-symlinks-15-r2.ebuild} | 17 ++++++++++++----- ...-r1.ebuild => clang-toolchain-symlinks-16-r2.ebuild} | 17 ++++++++++++----- sys-devel/clang-toolchain-symlinks/metadata.xml | 5 +++++ 4 files changed, 41 insertions(+), 15 deletions(-) diff --git a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-14-r1.ebuild b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-14-r2.ebuild similarity index 73% rename from sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-14-r1.ebuild rename to sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-14-r2.ebuild index 8a29178bf131..e8399381397f 100644 --- a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-14-r1.ebuild +++ b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-14-r2.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR} LICENSE="public-domain" SLOT="${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos" -IUSE="gcc-symlinks +native-symlinks" +IUSE="gcc-symlinks multilib-symlinks +native-symlinks" # Blocker for bug #872416 RDEPEND=" @@ -38,16 +38,23 @@ src_install() { ) fi - local abi t + 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 chost t local dest=/usr/lib/llvm/${SLOT}/bin dodir "${dest}" for t in "${tools[@]}"; do dosym "${t#*:}" "${dest}/${t%:*}" done - for abi in $(get_all_abis); do - local abi_chost=$(get_abi_CHOST "${abi}") + for chost in "${chosts[@]}"; do for t in "${tools[@]}"; do - dosym "${t#*:}" "${dest}/${abi_chost}-${t%:*}" + dosym "${t#*:}" "${dest}/${chost}-${t%:*}" done done } diff --git a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r1.ebuild b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild similarity index 73% rename from sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r1.ebuild rename to sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild index 8a29178bf131..e8399381397f 100644 --- a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r1.ebuild +++ b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR} LICENSE="public-domain" SLOT="${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos" -IUSE="gcc-symlinks +native-symlinks" +IUSE="gcc-symlinks multilib-symlinks +native-symlinks" # Blocker for bug #872416 RDEPEND=" @@ -38,16 +38,23 @@ src_install() { ) fi - local abi t + 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 chost t local dest=/usr/lib/llvm/${SLOT}/bin dodir "${dest}" for t in "${tools[@]}"; do dosym "${t#*:}" "${dest}/${t%:*}" done - for abi in $(get_all_abis); do - local abi_chost=$(get_abi_CHOST "${abi}") + for chost in "${chosts[@]}"; do for t in "${tools[@]}"; do - dosym "${t#*:}" "${dest}/${abi_chost}-${t%:*}" + dosym "${t#*:}" "${dest}/${chost}-${t%:*}" done done } diff --git a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r1.ebuild b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild similarity index 71% rename from sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r1.ebuild rename to sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild index 096e1f029ed9..f75afa7088b4 100644 --- a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r1.ebuild +++ b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild @@ -14,7 +14,7 @@ LICENSE="public-domain" SLOT="${PV}" KEYWORDS="" PROPERTIES="live" -IUSE="gcc-symlinks +native-symlinks" +IUSE="gcc-symlinks multilib-symlinks +native-symlinks" # Blocker for bug #872416 RDEPEND=" @@ -39,16 +39,23 @@ src_install() { ) fi - local abi t + 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 chost t local dest=/usr/lib/llvm/${SLOT}/bin dodir "${dest}" for t in "${tools[@]}"; do dosym "${t#*:}" "${dest}/${t%:*}" done - for abi in $(get_all_abis); do - local abi_chost=$(get_abi_CHOST "${abi}") + for chost in "${chosts[@]}"; do for t in "${tools[@]}"; do - dosym "${t#*:}" "${dest}/${abi_chost}-${t%:*}" + dosym "${t#*:}" "${dest}/${chost}-${t%:*}" done done } diff --git a/sys-devel/clang-toolchain-symlinks/metadata.xml b/sys-devel/clang-toolchain-symlinks/metadata.xml index 58c5027c2994..bf4e9fc6a6ca 100644 --- a/sys-devel/clang-toolchain-symlinks/metadata.xml +++ b/sys-devel/clang-toolchain-symlinks/metadata.xml @@ -9,6 +9,11 @@ Install symlinks for 'gcc' and 'g++' for extra compatibility. + + 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. + Install generic tool symlinks like 'cc' and 'c++', as well as ${CTARGET}-*. These symlinks are installed