commit: c5ab9bebd0a5f16fdd6f870fd6e6b99fecd4a398
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 10:57:49 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 11:13:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ab9beb
dev-debug/lldb: Migrate to llvm-utils
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-debug/lldb/lldb-18.1.0_rc2.ebuild | 9 +++------
dev-debug/lldb/lldb-19.0.0.9999.ebuild | 9 +++------
dev-debug/lldb/lldb-19.0.0_pre20240203.ebuild | 9 +++------
3 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/dev-debug/lldb/lldb-18.1.0_rc2.ebuild
b/dev-debug/lldb/lldb-18.1.0_rc2.ebuild
index eb67407b87fc..6d10771e220b 100644
--- a/dev-debug/lldb/lldb-18.1.0_rc2.ebuild
+++ b/dev-debug/lldb/lldb-18.1.0_rc2.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-single-r1
+inherit cmake llvm.org llvm-utils python-single-r1
DESCRIPTION="The LLVM debugger"
HOMEPAGE="https://llvm.org/";
@@ -51,12 +51,9 @@ LLVM_COMPONENTS=( lldb cmake llvm/utils )
LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
llvm.org_set_globals
-pkg_setup() {
- LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
- python-single-r1_pkg_setup
-}
-
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/dev-debug/lldb/lldb-19.0.0.9999.ebuild
b/dev-debug/lldb/lldb-19.0.0.9999.ebuild
index eb67407b87fc..6d10771e220b 100644
--- a/dev-debug/lldb/lldb-19.0.0.9999.ebuild
+++ b/dev-debug/lldb/lldb-19.0.0.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-single-r1
+inherit cmake llvm.org llvm-utils python-single-r1
DESCRIPTION="The LLVM debugger"
HOMEPAGE="https://llvm.org/";
@@ -51,12 +51,9 @@ LLVM_COMPONENTS=( lldb cmake llvm/utils )
LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
llvm.org_set_globals
-pkg_setup() {
- LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
- python-single-r1_pkg_setup
-}
-
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/dev-debug/lldb/lldb-19.0.0_pre20240203.ebuild
b/dev-debug/lldb/lldb-19.0.0_pre20240203.ebuild
index eb67407b87fc..6d10771e220b 100644
--- a/dev-debug/lldb/lldb-19.0.0_pre20240203.ebuild
+++ b/dev-debug/lldb/lldb-19.0.0_pre20240203.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-single-r1
+inherit cmake llvm.org llvm-utils python-single-r1
DESCRIPTION="The LLVM debugger"
HOMEPAGE="https://llvm.org/";
@@ -51,12 +51,9 @@ LLVM_COMPONENTS=( lldb cmake llvm/utils )
LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
llvm.org_set_globals
-pkg_setup() {
- LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
- python-single-r1_pkg_setup
-}
-
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"
