commit: dfa28b3246e07a048cd5af9f0ec41159698af9fb
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 11:00:40 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 11:13:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfa28b32
sys-libs/compiler-rt-sanitizers: Migrate to llvm-utils
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.0_rc2.ebuild | 5 +++--
.../compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0.9999.ebuild | 5 +++--
.../compiler-rt-sanitizers-19.0.0_pre20240203.ebuild | 5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.0_rc2.ebuild
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.0_rc2.ebuild
index 2ab1ae07e4c7..57f868d54be6 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.0_rc2.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.0_rc2.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
HOMEPAGE="https://llvm.org/";
@@ -72,7 +72,6 @@ pkg_pretend() {
pkg_setup() {
check_space
- LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
python-any-r1_pkg_setup
}
@@ -102,6 +101,8 @@ src_prepare() {
}
src_configure() {
+ llvm_prepend_path "${LLVM_MAJOR}"
+
# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
diff --git
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0.9999.ebuild
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0.9999.ebuild
index 2ab1ae07e4c7..57f868d54be6 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
HOMEPAGE="https://llvm.org/";
@@ -72,7 +72,6 @@ pkg_pretend() {
pkg_setup() {
check_space
- LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
python-any-r1_pkg_setup
}
@@ -102,6 +101,8 @@ src_prepare() {
}
src_configure() {
+ llvm_prepend_path "${LLVM_MAJOR}"
+
# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
diff --git
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240203.ebuild
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240203.ebuild
index 2ab1ae07e4c7..57f868d54be6 100644
---
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240203.ebuild
+++
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240203.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
HOMEPAGE="https://llvm.org/";
@@ -72,7 +72,6 @@ pkg_pretend() {
pkg_setup() {
check_space
- LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
python-any-r1_pkg_setup
}
@@ -102,6 +101,8 @@ src_prepare() {
}
src_configure() {
+ llvm_prepend_path "${LLVM_MAJOR}"
+
# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
