dev-util/lldb: Support building against slotted LLVM

diff --git a/dev-util/lldb/lldb-4.0.0_rc1.ebuild b/dev-util/lldb/lldb-4.0.0_rc1.ebuild
index cb7535c8b5c31c83cd19474c159e1113ce562d0d..0f7bd4f0b5ec6c8e5b74d2aaaa0cc29621d22f4e 100644 (file)
--- a/dev-util/lldb/lldb-4.0.0_rc1.ebuild
+++ b/dev-util/lldb/lldb-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-single-r1 toolchain-funcs
+inherit cmake-utils llvm python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="http://llvm.org/"
@@ -43,6 +43,11 @@ S=${WORKDIR}/${P/_/}.src
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
+pkg_setup() {
+       LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+       python-single-r1_pkg_setup
+}
+
 src_unpack() {
        default
 
@@ -52,7 +57,6 @@ src_unpack() {
 }
 
 src_configure() {
-       local libdir=$(get_libdir)
        local mycmakeargs=(
                -DLLDB_DISABLE_CURSES=$(usex !ncurses)
                -DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
@@ -61,10 +65,10 @@ src_configure() {
 
                -DLLVM_BUILD_TESTS=$(usex test)
                # compilers for lit tests
-               -DLLDB_TEST_C_COMPILER="${EPREFIX}/usr/bin/clang"
-               -DLLDB_TEST_CXX_COMPILER="${EPREFIX}/usr/bin/clang++"
+               -DLLDB_TEST_C_COMPILER="$(type -P clang)"
+               -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
                # compiler for ole' python tests
-               -DLLDB_TEST_COMPILER="${EPREFIX}/usr/bin/clang"
+               -DLLDB_TEST_COMPILER="$(type -P clang)"
 
                # TODO: fix upstream to detect this properly
                -DHAVE_LIBDL=ON

diff --git a/dev-util/lldb/lldb-9999.ebuild b/dev-util/lldb/lldb-9999.ebuild
index 6d1a954e59fd4cca428aeae9186370df4e35eb84..3a0deeaf921731d7e122c4222ffca4d4a1bc3cbd 100644 (file)
--- a/dev-util/lldb/lldb-9999.ebuild
+++ b/dev-util/lldb/lldb-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-single-r1 toolchain-funcs
+inherit cmake-utils git-r3 llvm python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="http://llvm.org/"
@@ -42,6 +42,11 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
+pkg_setup() {
+       llvm_pkg_setup
+       python-single-r1_pkg_setup
+}
+
 src_unpack() {
        if use test; then
                # needed for patched gtest
@@ -58,7 +63,6 @@ src_unpack() {
 }
 
 src_configure() {
-       local libdir=$(get_libdir)
        local mycmakeargs=(
                -DLLDB_DISABLE_CURSES=$(usex !ncurses)
                -DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
@@ -67,10 +71,10 @@ src_configure() {
 
                -DLLVM_BUILD_TESTS=$(usex test)
                # compilers for lit tests
-               -DLLDB_TEST_C_COMPILER="${EPREFIX}/usr/bin/clang"
-               -DLLDB_TEST_CXX_COMPILER="${EPREFIX}/usr/bin/clang++"
+               -DLLDB_TEST_C_COMPILER="$(type -P clang)"
+               -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
                # compiler for ole' python tests
-               -DLLDB_TEST_COMPILER="${EPREFIX}/usr/bin/clang"
+               -DLLDB_TEST_COMPILER="$(type -P clang)"
 
                # TODO: fix upstream to detect this properly
                -DHAVE_LIBDL=ON