From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1444352-garchives=archives.gentoo.org@lists.gentoo.org>
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 3DB35158095
for <garchives@archives.gentoo.org>; Fri, 7 Oct 2022 16:41:38 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7C76BE0984;
Fri, 7 Oct 2022 16:41:37 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 66E52E0984
for <gentoo-commits@lists.gentoo.org>; Fri, 7 Oct 2022 16:41:37 +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 AFA9E340D36
for <gentoo-commits@lists.gentoo.org>; Fri, 7 Oct 2022 16:41:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DC49C608
for <gentoo-commits@lists.gentoo.org>; Fri, 7 Oct 2022 16:41:33 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
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" <mgorny@gentoo.org>
Message-ID: <1665160883.c1ca8e9d067d979dab1ed1b595bcc8471e82278c.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-15.0.2.9999.ebuild sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild sys-libs/compiler-rt/compiler-rt-16.0.0_pre20221006.ebuild
X-VCS-Directories: sys-libs/compiler-rt/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: c1ca8e9d067d979dab1ed1b595bcc8471e82278c
X-VCS-Branch: master
Date: Fri, 7 Oct 2022 16:41:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: ba6d8f2b-011f-4bd1-b1cc-5641c1031b36
X-Archives-Hash: 10892303075f4eaf94e064a8b798a961
commit: c1ca8e9d067d979dab1ed1b595bcc8471e82278c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 7 16:29:41 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 7 16:41:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1ca8e9d
sys-libs/compiler-rt: Use the new version vars
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-libs/compiler-rt/compiler-rt-15.0.2.9999.ebuild | 15 +++++++--------
sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild | 15 +++++++--------
.../compiler-rt/compiler-rt-16.0.0_pre20221006.ebuild | 15 +++++++--------
3 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.2.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.2.9999.ebuild
index 236d4a319ccf..957caa27a746 100644
--- a/sys-libs/compiler-rt/compiler-rt-15.0.2.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-15.0.2.9999.ebuild
@@ -10,21 +10,20 @@ DESCRIPTION="Compiler runtime library for clang (built-in part)"
HOMEPAGE="https://llvm.org/"
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="$(ver_cut 1-3)"
+SLOT="${LLVM_VERSION}"
KEYWORDS=""
IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
RESTRICT="!test? ( test ) !clang? ( test )"
-LLVM_MAX_SLOT=${SLOT%%.*}
DEPEND="
- sys-devel/llvm:${LLVM_MAX_SLOT}
+ sys-devel/llvm:${LLVM_MAJOR}
"
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%_*}*:${LLVM_MAX_SLOT}
+ =sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
)
!test? (
${PYTHON_DEPS}
@@ -52,7 +51,7 @@ pkg_setup() {
# bootstrap-prefix to set the appropriate path vars to LLVM instead
# of using llvm_pkg_setup.
if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
- llvm_pkg_setup
+ LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
fi
python-any-r1_pkg_setup
}
@@ -97,7 +96,7 @@ src_configure() {
fi
local mycmakeargs=(
- -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+ -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_VERSION}"
-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
@@ -135,8 +134,8 @@ src_configure() {
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-DLLVM_LIT_ARGS="$(get_lit_flags)"
- -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++"
+ -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
+ -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/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 236d4a319ccf..957caa27a746 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
@@ -10,21 +10,20 @@ DESCRIPTION="Compiler runtime library for clang (built-in part)"
HOMEPAGE="https://llvm.org/"
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="$(ver_cut 1-3)"
+SLOT="${LLVM_VERSION}"
KEYWORDS=""
IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
RESTRICT="!test? ( test ) !clang? ( test )"
-LLVM_MAX_SLOT=${SLOT%%.*}
DEPEND="
- sys-devel/llvm:${LLVM_MAX_SLOT}
+ sys-devel/llvm:${LLVM_MAJOR}
"
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%_*}*:${LLVM_MAX_SLOT}
+ =sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
)
!test? (
${PYTHON_DEPS}
@@ -52,7 +51,7 @@ pkg_setup() {
# bootstrap-prefix to set the appropriate path vars to LLVM instead
# of using llvm_pkg_setup.
if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
- llvm_pkg_setup
+ LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
fi
python-any-r1_pkg_setup
}
@@ -97,7 +96,7 @@ src_configure() {
fi
local mycmakeargs=(
- -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+ -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_VERSION}"
-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
@@ -135,8 +134,8 @@ src_configure() {
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-DLLVM_LIT_ARGS="$(get_lit_flags)"
- -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++"
+ -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
+ -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
)
fi
diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20221006.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20221006.ebuild
index 236d4a319ccf..957caa27a746 100644
--- a/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20221006.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20221006.ebuild
@@ -10,21 +10,20 @@ DESCRIPTION="Compiler runtime library for clang (built-in part)"
HOMEPAGE="https://llvm.org/"
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="$(ver_cut 1-3)"
+SLOT="${LLVM_VERSION}"
KEYWORDS=""
IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
RESTRICT="!test? ( test ) !clang? ( test )"
-LLVM_MAX_SLOT=${SLOT%%.*}
DEPEND="
- sys-devel/llvm:${LLVM_MAX_SLOT}
+ sys-devel/llvm:${LLVM_MAJOR}
"
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%_*}*:${LLVM_MAX_SLOT}
+ =sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
)
!test? (
${PYTHON_DEPS}
@@ -52,7 +51,7 @@ pkg_setup() {
# bootstrap-prefix to set the appropriate path vars to LLVM instead
# of using llvm_pkg_setup.
if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
- llvm_pkg_setup
+ LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
fi
python-any-r1_pkg_setup
}
@@ -97,7 +96,7 @@ src_configure() {
fi
local mycmakeargs=(
- -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+ -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_VERSION}"
-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
@@ -135,8 +134,8 @@ src_configure() {
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-DLLVM_LIT_ARGS="$(get_lit_flags)"
- -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++"
+ -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
+ -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
)
fi