sys-devel/lld: Support building against slotted LLVM

diff --git a/sys-devel/lld/lld-4.0.0_rc1.ebuild b/sys-devel/lld/lld-4.0.0_rc1.ebuild
index cb624392d7a837a9a259854c403008525778d0f1..f927da85e4f3eb495eae6112a81be770a436a740 100644 (file)
--- a/sys-devel/lld/lld-4.0.0_rc1.ebuild
+++ b/sys-devel/lld/lld-4.0.0_rc1.ebuild
@@ -9,7 +9,7 @@ EAPI=6
 CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-any-r1
+inherit cmake-utils llvm python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="http://llvm.org/"
@@ -38,6 +38,7 @@ python_check_deps() {
 }
 
 pkg_setup() {
+       LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
        use test && python-any-r1_pkg_setup
 }
 
@@ -50,7 +51,6 @@ src_unpack() {
 }
 
 src_configure() {
-       local libdir=$(get_libdir)
        local mycmakeargs=(
                # TODO: fix rpaths
                #-DBUILD_SHARED_LIBS=ON

diff --git a/sys-devel/lld/lld-9999.ebuild b/sys-devel/lld/lld-9999.ebuild
index b4f23d3031e8bee1064060ad3caf5de53d7c6f3f..b6ef4ad0436ed295977e8124892bddb62d9ef3c1 100644 (file)
--- a/sys-devel/lld/lld-9999.ebuild
+++ b/sys-devel/lld/lld-9999.ebuild
@@ -9,7 +9,7 @@ EAPI=6
 CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils git-r3 python-any-r1
+inherit cmake-utils git-r3 llvm python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="http://llvm.org/"
@@ -34,6 +34,7 @@ python_check_deps() {
 }
 
 pkg_setup() {
+       llvm_pkg_setup
        use test && python-any-r1_pkg_setup
 }
 
@@ -53,7 +54,6 @@ src_unpack() {
 }
 
 src_configure() {
-       local libdir=$(get_libdir)
        local mycmakeargs=(
                -DBUILD_SHARED_LIBS=ON