commit:     d05534125dff871c9f6598690c972ab6ea36bb66
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  7 16:51:04 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 10:47:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0553412

sys-devel/lld: Migrate to llvm-utils.eclass

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/35196
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-devel/lld/lld-18.1.0_rc2.ebuild         | 5 +++--
 sys-devel/lld/lld-19.0.0.9999.ebuild        | 5 +++--
 sys-devel/lld/lld-19.0.0_pre20240203.ebuild | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sys-devel/lld/lld-18.1.0_rc2.ebuild 
b/sys-devel/lld/lld-18.1.0_rc2.ebuild
index e72385c1bdb1..db957ad1ab9a 100644
--- a/sys-devel/lld/lld-18.1.0_rc2.ebuild
+++ b/sys-devel/lld/lld-18.1.0_rc2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/";
@@ -41,7 +41,6 @@ python_check_deps() {
 }
 
 pkg_setup() {
-       LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
        use test && python-any-r1_pkg_setup
 }
 
@@ -57,6 +56,8 @@ src_unpack() {
 }
 
 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-devel/lld/lld-19.0.0.9999.ebuild 
b/sys-devel/lld/lld-19.0.0.9999.ebuild
index e72385c1bdb1..db957ad1ab9a 100644
--- a/sys-devel/lld/lld-19.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-19.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/";
@@ -41,7 +41,6 @@ python_check_deps() {
 }
 
 pkg_setup() {
-       LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
        use test && python-any-r1_pkg_setup
 }
 
@@ -57,6 +56,8 @@ src_unpack() {
 }
 
 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-devel/lld/lld-19.0.0_pre20240203.ebuild 
b/sys-devel/lld/lld-19.0.0_pre20240203.ebuild
index e72385c1bdb1..db957ad1ab9a 100644
--- a/sys-devel/lld/lld-19.0.0_pre20240203.ebuild
+++ b/sys-devel/lld/lld-19.0.0_pre20240203.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/";
@@ -41,7 +41,6 @@ python_check_deps() {
 }
 
 pkg_setup() {
-       LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
        use test && python-any-r1_pkg_setup
 }
 
@@ -57,6 +56,8 @@ src_unpack() {
 }
 
 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"
 

Reply via email to