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 9BADE158095 for ; Sun, 11 Sep 2022 18:13:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C071AE0863; Sun, 11 Sep 2022 18:13:06 +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 AA945E0863 for ; Sun, 11 Sep 2022 18:13:06 +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 CD7B7335DBE for ; Sun, 11 Sep 2022 18:13:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9495557D for ; Sun, 11 Sep 2022 18:13:03 +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: <1662919979.94ebfe3225cc3753d6b6b2a170d084ef38ef22c3.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild sys-libs/compiler-rt/compiler-rt-15.0.0.ebuild sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild X-VCS-Directories: sys-libs/compiler-rt/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 94ebfe3225cc3753d6b6b2a170d084ef38ef22c3 X-VCS-Branch: master Date: Sun, 11 Sep 2022 18:13:03 +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: be215478-5b93-4bcc-bdcb-b4d7d3f81572 X-Archives-Hash: a50d00dd1ffa59bd9a345950626f4c91 commit: 94ebfe3225cc3753d6b6b2a170d084ef38ef22c3 Author: Michał Górny gentoo org> AuthorDate: Sun Sep 11 18:05:59 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Sep 11 18:12:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ebfe32 sys-libs/compiler-rt: Force matching LLVM version Closes: https://bugs.gentoo.org/869620 Signed-off-by: Michał Górny gentoo.org> sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild | 12 ++++++------ sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild | 11 +++++------ sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild | 11 +++++------ sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild | 11 +++++------ sys-libs/compiler-rt/compiler-rt-15.0.0.ebuild | 11 +++++------ sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild | 11 +++++------ 6 files changed, 31 insertions(+), 36 deletions(-) diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild index 6de6eb7c2d78..5479e8167692 100644 --- a/sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild @@ -15,16 +15,16 @@ KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6" + sys-devel/llvm:${LLVM_MAX_SLOT} +" BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -121,8 +121,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" ) fi diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild index 7493e7480ff1..5a8467294d23 100644 --- a/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild @@ -15,17 +15,16 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-mac IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} " BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -136,8 +135,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" ) fi diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild index f6cf92a36424..bad0285aefbc 100644 --- a/sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild @@ -15,17 +15,16 @@ KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} " BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -127,8 +126,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" ) fi diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild index a7b7ace68705..236d4a319ccf 100644 --- a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild @@ -15,17 +15,16 @@ KEYWORDS="" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} " BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -136,8 +135,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" ) fi diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.0.ebuild index f4fd6ab4b702..68720a38d8fa 100644 --- a/sys-libs/compiler-rt/compiler-rt-15.0.0.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-15.0.0.ebuild @@ -15,17 +15,16 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-mac IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} " BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -136,8 +135,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" ) fi diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild index a7b7ace68705..236d4a319ccf 100644 --- a/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild @@ -15,17 +15,16 @@ KEYWORDS="" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} " BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) !test? ( ${PYTHON_DEPS} @@ -136,8 +135,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" ) fi