[gentoo-commits] repo/gentoo:master commit in: sys-devel/lld/

Fri, 14 Oct 2022 06:08:28 -0700 

commit:     ea9e70d251dd711b91ac3d6da48ab09ce564f3ea
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 12:58:56 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 13:08:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea9e70d2

sys-devel/lld: Enable slotting on LLD 15+

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../lld/{lld-15.0.3.9999.ebuild => lld-15.0.2-r1.ebuild}     | 12 +++++++-----
 sys-devel/lld/lld-15.0.3.9999.ebuild                         | 10 ++++++----
 sys-devel/lld/lld-16.0.0.9999.ebuild                         | 10 ++++++----
 ...d-16.0.0.9999.ebuild => lld-16.0.0_pre20221010-r1.ebuild} | 10 ++++++----
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/sys-devel/lld/lld-15.0.3.9999.ebuild 
b/sys-devel/lld/lld-15.0.2-r1.ebuild
similarity index 82%
copy from sys-devel/lld/lld-15.0.3.9999.ebuild
copy to sys-devel/lld/lld-15.0.2-r1.ebuild
index ab883859a6e3..8372cc0466ed 100644
--- a/sys-devel/lld/lld-15.0.3.9999.ebuild
+++ b/sys-devel/lld/lld-15.0.2-r1.ebuild
@@ -10,8 +10,8 @@ DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/";
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS=""
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
@@ -20,15 +20,16 @@ DEPEND="
 "
 RDEPEND="
        ${DEPEND}
+       !sys-devel/lld:0
 "
 BDEPEND="
        test? (
                >=dev-util/cmake-3.16
-               $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+               $(python_gen_any_dep 
">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
        )
 "
 PDEPEND="
-       sys-devel/lld-toolchain-symlinks:${LLVM_MAJOR}
+       >=sys-devel/lld-toolchain-symlinks-15-r2:${LLVM_MAJOR}
 "
 
 LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
@@ -36,7 +37,7 @@ LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
 llvm.org_set_globals
 
 python_check_deps() {
-       python_has_version "~dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+       python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -62,6 +63,7 @@ src_configure() {
        use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
 
        local mycmakeargs=(
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
                -DBUILD_SHARED_LIBS=ON
                -DLLVM_INCLUDE_TESTS=$(usex test)
                -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"

diff --git a/sys-devel/lld/lld-15.0.3.9999.ebuild 
b/sys-devel/lld/lld-15.0.3.9999.ebuild
index ab883859a6e3..39bcff1a7b13 100644
--- a/sys-devel/lld/lld-15.0.3.9999.ebuild
+++ b/sys-devel/lld/lld-15.0.3.9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/";
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
 KEYWORDS=""
 IUSE="debug test"
 RESTRICT="!test? ( test )"
@@ -20,15 +20,16 @@ DEPEND="
 "
 RDEPEND="
        ${DEPEND}
+       !sys-devel/lld:0
 "
 BDEPEND="
        test? (
                >=dev-util/cmake-3.16
-               $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+               $(python_gen_any_dep 
">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
        )
 "
 PDEPEND="
-       sys-devel/lld-toolchain-symlinks:${LLVM_MAJOR}
+       >=sys-devel/lld-toolchain-symlinks-15-r2:${LLVM_MAJOR}
 "
 
 LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
@@ -36,7 +37,7 @@ LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
 llvm.org_set_globals
 
 python_check_deps() {
-       python_has_version "~dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+       python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -62,6 +63,7 @@ src_configure() {
        use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
 
        local mycmakeargs=(
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
                -DBUILD_SHARED_LIBS=ON
                -DLLVM_INCLUDE_TESTS=$(usex test)
                -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"

diff --git a/sys-devel/lld/lld-16.0.0.9999.ebuild 
b/sys-devel/lld/lld-16.0.0.9999.ebuild
index 7eaee12b2222..8af0d07d7df2 100644
--- a/sys-devel/lld/lld-16.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-16.0.0.9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/";
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
 KEYWORDS=""
 IUSE="debug test zstd"
 RESTRICT="!test? ( test )"
@@ -21,15 +21,16 @@ DEPEND="
 "
 RDEPEND="
        ${DEPEND}
+       !sys-devel/lld:0
 "
 BDEPEND="
        test? (
                >=dev-util/cmake-3.16
-               $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+               $(python_gen_any_dep 
">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
        )
 "
 PDEPEND="
-       sys-devel/lld-toolchain-symlinks:${LLVM_MAJOR}
+       >=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
 "
 
 LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
@@ -37,7 +38,7 @@ LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
 llvm.org_set_globals
 
 python_check_deps() {
-       python_has_version "~dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+       python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -63,6 +64,7 @@ src_configure() {
        use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
 
        local mycmakeargs=(
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
                -DBUILD_SHARED_LIBS=ON
                -DLLVM_INCLUDE_TESTS=$(usex test)
        )

diff --git a/sys-devel/lld/lld-16.0.0.9999.ebuild 
b/sys-devel/lld/lld-16.0.0_pre20221010-r1.ebuild
similarity index 84%
copy from sys-devel/lld/lld-16.0.0.9999.ebuild
copy to sys-devel/lld/lld-16.0.0_pre20221010-r1.ebuild
index 7eaee12b2222..8af0d07d7df2 100644
--- a/sys-devel/lld/lld-16.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-16.0.0_pre20221010-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/";
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
 KEYWORDS=""
 IUSE="debug test zstd"
 RESTRICT="!test? ( test )"
@@ -21,15 +21,16 @@ DEPEND="
 "
 RDEPEND="
        ${DEPEND}
+       !sys-devel/lld:0
 "
 BDEPEND="
        test? (
                >=dev-util/cmake-3.16
-               $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+               $(python_gen_any_dep 
">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
        )
 "
 PDEPEND="
-       sys-devel/lld-toolchain-symlinks:${LLVM_MAJOR}
+       >=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
 "
 
 LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
@@ -37,7 +38,7 @@ LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
 llvm.org_set_globals
 
 python_check_deps() {
-       python_has_version "~dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+       python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -63,6 +64,7 @@ src_configure() {
        use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
 
        local mycmakeargs=(
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
                -DBUILD_SHARED_LIBS=ON
                -DLLVM_INCLUDE_TESTS=$(usex test)
        )

Reply via email to