| 1 |
commit: 4e3c559c6c04727fb2dbcbbdda0fea196248590a |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 30 21:55:22 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 15 12:47:24 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e3c559c |
| 7 |
|
| 8 |
dev-util/lldb: Support building against slotted LLVM |
| 9 |
|
| 10 |
dev-util/lldb/lldb-4.0.0_rc1.ebuild | 14 +++++++++----- |
| 11 |
dev-util/lldb/lldb-9999.ebuild | 14 +++++++++----- |
| 12 |
2 files changed, 18 insertions(+), 10 deletions(-) |
| 13 |
|
| 14 |
diff --git a/dev-util/lldb/lldb-4.0.0_rc1.ebuild b/dev-util/lldb/lldb-4.0.0_rc1.ebuild |
| 15 |
index cb7535c8b5..0f7bd4f0b5 100644 |
| 16 |
--- a/dev-util/lldb/lldb-4.0.0_rc1.ebuild |
| 17 |
+++ b/dev-util/lldb/lldb-4.0.0_rc1.ebuild |
| 18 |
@@ -9,7 +9,7 @@ EAPI=6 |
| 19 |
CMAKE_MIN_VERSION=3.7.0-r1 |
| 20 |
PYTHON_COMPAT=( python2_7 ) |
| 21 |
|
| 22 |
-inherit cmake-utils python-single-r1 toolchain-funcs |
| 23 |
+inherit cmake-utils llvm python-single-r1 toolchain-funcs |
| 24 |
|
| 25 |
DESCRIPTION="The LLVM debugger" |
| 26 |
HOMEPAGE="http://llvm.org/" |
| 27 |
@@ -43,6 +43,11 @@ S=${WORKDIR}/${P/_/}.src |
| 28 |
# least intrusive of all |
| 29 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
| 30 |
|
| 31 |
+pkg_setup() { |
| 32 |
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup |
| 33 |
+ python-single-r1_pkg_setup |
| 34 |
+} |
| 35 |
+ |
| 36 |
src_unpack() { |
| 37 |
default |
| 38 |
|
| 39 |
@@ -52,7 +57,6 @@ src_unpack() { |
| 40 |
} |
| 41 |
|
| 42 |
src_configure() { |
| 43 |
- local libdir=$(get_libdir) |
| 44 |
local mycmakeargs=( |
| 45 |
-DLLDB_DISABLE_CURSES=$(usex !ncurses) |
| 46 |
-DLLDB_DISABLE_LIBEDIT=$(usex !libedit) |
| 47 |
@@ -61,10 +65,10 @@ src_configure() { |
| 48 |
|
| 49 |
-DLLVM_BUILD_TESTS=$(usex test) |
| 50 |
# compilers for lit tests |
| 51 |
- -DLLDB_TEST_C_COMPILER="${EPREFIX}/usr/bin/clang" |
| 52 |
- -DLLDB_TEST_CXX_COMPILER="${EPREFIX}/usr/bin/clang++" |
| 53 |
+ -DLLDB_TEST_C_COMPILER="$(type -P clang)" |
| 54 |
+ -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)" |
| 55 |
# compiler for ole' python tests |
| 56 |
- -DLLDB_TEST_COMPILER="${EPREFIX}/usr/bin/clang" |
| 57 |
+ -DLLDB_TEST_COMPILER="$(type -P clang)" |
| 58 |
|
| 59 |
# TODO: fix upstream to detect this properly |
| 60 |
-DHAVE_LIBDL=ON |
| 61 |
|
| 62 |
diff --git a/dev-util/lldb/lldb-9999.ebuild b/dev-util/lldb/lldb-9999.ebuild |
| 63 |
index 6d1a954e59..3a0deeaf92 100644 |
| 64 |
--- a/dev-util/lldb/lldb-9999.ebuild |
| 65 |
+++ b/dev-util/lldb/lldb-9999.ebuild |
| 66 |
@@ -9,7 +9,7 @@ EAPI=6 |
| 67 |
CMAKE_MIN_VERSION=3.7.0-r1 |
| 68 |
PYTHON_COMPAT=( python2_7 ) |
| 69 |
|
| 70 |
-inherit cmake-utils git-r3 python-single-r1 toolchain-funcs |
| 71 |
+inherit cmake-utils git-r3 llvm python-single-r1 toolchain-funcs |
| 72 |
|
| 73 |
DESCRIPTION="The LLVM debugger" |
| 74 |
HOMEPAGE="http://llvm.org/" |
| 75 |
@@ -42,6 +42,11 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE} |
| 76 |
# least intrusive of all |
| 77 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
| 78 |
|
| 79 |
+pkg_setup() { |
| 80 |
+ llvm_pkg_setup |
| 81 |
+ python-single-r1_pkg_setup |
| 82 |
+} |
| 83 |
+ |
| 84 |
src_unpack() { |
| 85 |
if use test; then |
| 86 |
# needed for patched gtest |
| 87 |
@@ -58,7 +63,6 @@ src_unpack() { |
| 88 |
} |
| 89 |
|
| 90 |
src_configure() { |
| 91 |
- local libdir=$(get_libdir) |
| 92 |
local mycmakeargs=( |
| 93 |
-DLLDB_DISABLE_CURSES=$(usex !ncurses) |
| 94 |
-DLLDB_DISABLE_LIBEDIT=$(usex !libedit) |
| 95 |
@@ -67,10 +71,10 @@ src_configure() { |
| 96 |
|
| 97 |
-DLLVM_BUILD_TESTS=$(usex test) |
| 98 |
# compilers for lit tests |
| 99 |
- -DLLDB_TEST_C_COMPILER="${EPREFIX}/usr/bin/clang" |
| 100 |
- -DLLDB_TEST_CXX_COMPILER="${EPREFIX}/usr/bin/clang++" |
| 101 |
+ -DLLDB_TEST_C_COMPILER="$(type -P clang)" |
| 102 |
+ -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)" |
| 103 |
# compiler for ole' python tests |
| 104 |
- -DLLDB_TEST_COMPILER="${EPREFIX}/usr/bin/clang" |
| 105 |
+ -DLLDB_TEST_COMPILER="$(type -P clang)" |
| 106 |
|
| 107 |
# TODO: fix upstream to detect this properly |
| 108 |
-DHAVE_LIBDL=ON |
Archives