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 0E36A158094 for ; Wed, 21 Sep 2022 08:23:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01247E0BEF; Wed, 21 Sep 2022 08:23:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DEBFDE0BEF for ; Wed, 21 Sep 2022 08:23:25 +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 21D1C341109 for ; Wed, 21 Sep 2022 08:23:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8BCA75DB for ; Wed, 21 Sep 2022 08:23:23 +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: <1663748600.2a7f33b4ea73c1d355438653529b633ec2240f9a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxx/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcxx/libcxx-15.0.1.9999.ebuild sys-libs/libcxx/libcxx-15.0.1.ebuild sys-libs/libcxx/libcxx-16.0.0.9999.ebuild sys-libs/libcxx/libcxx-16.0.0_pre20220918.ebuild X-VCS-Directories: sys-libs/libcxx/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2a7f33b4ea73c1d355438653529b633ec2240f9a X-VCS-Branch: master Date: Wed, 21 Sep 2022 08:23:23 +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: c438001c-d4d7-46e4-94d6-b4388f9bd20c X-Archives-Hash: 6e4f690b465802790ab78afb2625d22e commit: 2a7f33b4ea73c1d355438653529b633ec2240f9a Author: Michał Górny gentoo org> AuthorDate: Wed Sep 21 08:11:42 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Sep 21 08:23:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a7f33b4 sys-libs/libcxx: Force matchling LLVM/Clang version Signed-off-by: Michał Górny gentoo.org> sys-libs/libcxx/libcxx-15.0.1.9999.ebuild | 15 ++++----------- sys-libs/libcxx/libcxx-15.0.1.ebuild | 15 ++++----------- sys-libs/libcxx/libcxx-16.0.0.9999.ebuild | 15 ++++----------- sys-libs/libcxx/libcxx-16.0.0_pre20220918.ebuild | 15 ++++----------- 4 files changed, 16 insertions(+), 44 deletions(-) diff --git a/sys-libs/libcxx/libcxx-15.0.1.9999.ebuild b/sys-libs/libcxx/libcxx-15.0.1.9999.ebuild index 07049e01ed34..28c4cca66346 100644 --- a/sys-libs/libcxx/libcxx-15.0.1.9999.ebuild +++ b/sys-libs/libcxx/libcxx-15.0.1.9999.ebuild @@ -23,16 +23,14 @@ RDEPEND=" ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) " -# llvm-6 for new lit options -# clang-3.9.0 installs necessary target symlinks unconditionally -# which removes the need for MULTILIB_USEDEP +LLVM_MAX_SLOT=${PV%%.*} DEPEND=" ${RDEPEND} - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} " BDEPEND=" clang? ( - sys-devel/clang + sys-devel/clang:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -91,9 +89,7 @@ src_configure() { } multilib_src_configure() { - if use clang && ! tc-is-clang; then - # Only do this conditionally to allow overriding with - # e.g. CC=clang-13 in case of breakage + if use clang; then local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ strip-unsupported-flags @@ -139,9 +135,6 @@ multilib_src_configure() { ) if use test; then - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" - mycmakeargs+=( -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" diff --git a/sys-libs/libcxx/libcxx-15.0.1.ebuild b/sys-libs/libcxx/libcxx-15.0.1.ebuild index 838aac063945..79e6aec88593 100644 --- a/sys-libs/libcxx/libcxx-15.0.1.ebuild +++ b/sys-libs/libcxx/libcxx-15.0.1.ebuild @@ -23,16 +23,14 @@ RDEPEND=" ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) " -# llvm-6 for new lit options -# clang-3.9.0 installs necessary target symlinks unconditionally -# which removes the need for MULTILIB_USEDEP +LLVM_MAX_SLOT=${PV%%.*} DEPEND=" ${RDEPEND} - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} " BDEPEND=" clang? ( - sys-devel/clang + sys-devel/clang:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -91,9 +89,7 @@ src_configure() { } multilib_src_configure() { - if use clang && ! tc-is-clang; then - # Only do this conditionally to allow overriding with - # e.g. CC=clang-13 in case of breakage + if use clang; then local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ strip-unsupported-flags @@ -139,9 +135,6 @@ multilib_src_configure() { ) if use test; then - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" - mycmakeargs+=( -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" diff --git a/sys-libs/libcxx/libcxx-16.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-16.0.0.9999.ebuild index 07049e01ed34..28c4cca66346 100644 --- a/sys-libs/libcxx/libcxx-16.0.0.9999.ebuild +++ b/sys-libs/libcxx/libcxx-16.0.0.9999.ebuild @@ -23,16 +23,14 @@ RDEPEND=" ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) " -# llvm-6 for new lit options -# clang-3.9.0 installs necessary target symlinks unconditionally -# which removes the need for MULTILIB_USEDEP +LLVM_MAX_SLOT=${PV%%.*} DEPEND=" ${RDEPEND} - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} " BDEPEND=" clang? ( - sys-devel/clang + sys-devel/clang:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -91,9 +89,7 @@ src_configure() { } multilib_src_configure() { - if use clang && ! tc-is-clang; then - # Only do this conditionally to allow overriding with - # e.g. CC=clang-13 in case of breakage + if use clang; then local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ strip-unsupported-flags @@ -139,9 +135,6 @@ multilib_src_configure() { ) if use test; then - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" - mycmakeargs+=( -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" diff --git a/sys-libs/libcxx/libcxx-16.0.0_pre20220918.ebuild b/sys-libs/libcxx/libcxx-16.0.0_pre20220918.ebuild index 07049e01ed34..28c4cca66346 100644 --- a/sys-libs/libcxx/libcxx-16.0.0_pre20220918.ebuild +++ b/sys-libs/libcxx/libcxx-16.0.0_pre20220918.ebuild @@ -23,16 +23,14 @@ RDEPEND=" ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) " -# llvm-6 for new lit options -# clang-3.9.0 installs necessary target symlinks unconditionally -# which removes the need for MULTILIB_USEDEP +LLVM_MAX_SLOT=${PV%%.*} DEPEND=" ${RDEPEND} - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} " BDEPEND=" clang? ( - sys-devel/clang + sys-devel/clang:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -91,9 +89,7 @@ src_configure() { } multilib_src_configure() { - if use clang && ! tc-is-clang; then - # Only do this conditionally to allow overriding with - # e.g. CC=clang-13 in case of breakage + if use clang; then local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ strip-unsupported-flags @@ -139,9 +135,6 @@ multilib_src_configure() { ) if use test; then - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" - mycmakeargs+=( -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)"