1 |
commit: f52b631c9e9d0a8ef2a555ed46d32878deaac4f1 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 1 17:44:57 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 3 11:46:17 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f52b631c |
7 |
|
8 |
dev-util/lldb: Port to llvm.org eclass |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-util/lldb/lldb-10.0.0.9999.ebuild | 17 +++++------------ |
13 |
dev-util/lldb/lldb-9.0.0.ebuild | 23 ++++------------------- |
14 |
dev-util/lldb/lldb-9.0.1.9999.ebuild | 18 +++++------------- |
15 |
3 files changed, 14 insertions(+), 44 deletions(-) |
16 |
|
17 |
diff --git a/dev-util/lldb/lldb-10.0.0.9999.ebuild b/dev-util/lldb/lldb-10.0.0.9999.ebuild |
18 |
index 4534586ab24..38487892977 100644 |
19 |
--- a/dev-util/lldb/lldb-10.0.0.9999.ebuild |
20 |
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild |
21 |
@@ -4,14 +4,14 @@ |
22 |
EAPI=7 |
23 |
|
24 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
25 |
-inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \ |
26 |
+inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \ |
27 |
toolchain-funcs |
28 |
|
29 |
DESCRIPTION="The LLVM debugger" |
30 |
HOMEPAGE="https://llvm.org/" |
31 |
-SRC_URI="" |
32 |
-EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
33 |
-S=${WORKDIR}/${P}/lldb |
34 |
+LLVM_COMPONENTS=( lldb ) |
35 |
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
36 |
+llvm.org_set_globals |
37 |
|
38 |
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
39 |
SLOT="0" |
40 |
@@ -45,13 +45,6 @@ pkg_setup() { |
41 |
python-single-r1_pkg_setup |
42 |
} |
43 |
|
44 |
-src_unpack() { |
45 |
- local dirs=( lldb ) |
46 |
- use test && dirs+=( llvm/lib/Testing/Support llvm/utils/unittest ) |
47 |
- git-r3_fetch |
48 |
- git-r3_checkout '' '' '' "${dirs[@]}" |
49 |
-} |
50 |
- |
51 |
src_configure() { |
52 |
local mycmakeargs=( |
53 |
-DLLDB_DISABLE_CURSES=$(usex !ncurses) |
54 |
@@ -80,7 +73,7 @@ src_configure() { |
55 |
-DLLDB_TEST_C_COMPILER="$(type -P clang)" |
56 |
-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)" |
57 |
|
58 |
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" |
59 |
+ -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
60 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
61 |
-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
62 |
) |
63 |
|
64 |
diff --git a/dev-util/lldb/lldb-9.0.0.ebuild b/dev-util/lldb/lldb-9.0.0.ebuild |
65 |
index 3c2667d0a03..bc79687eb31 100644 |
66 |
--- a/dev-util/lldb/lldb-9.0.0.ebuild |
67 |
+++ b/dev-util/lldb/lldb-9.0.0.ebuild |
68 |
@@ -4,17 +4,14 @@ |
69 |
EAPI=7 |
70 |
|
71 |
PYTHON_COMPAT=( python{2_7,3_{5,6}} ) |
72 |
-inherit cmake-utils llvm multiprocessing python-single-r1 \ |
73 |
+inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \ |
74 |
toolchain-funcs |
75 |
|
76 |
-MY_P=${P/_/}.src |
77 |
-LLVM_P=llvm-${PV/_/}.src |
78 |
- |
79 |
DESCRIPTION="The LLVM debugger" |
80 |
HOMEPAGE="https://llvm.org/" |
81 |
-SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz |
82 |
- test? ( https://releases.llvm.org/${PV}/${LLVM_P}.tar.xz )" |
83 |
-S=${WORKDIR}/${MY_P} |
84 |
+LLVM_COMPONENTS=( lldb ) |
85 |
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
86 |
+llvm.org_set_globals |
87 |
|
88 |
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
89 |
SLOT="0" |
90 |
@@ -47,18 +44,6 @@ pkg_setup() { |
91 |
python-single-r1_pkg_setup |
92 |
} |
93 |
|
94 |
-src_unpack() { |
95 |
- einfo "Unpacking ${MY_P}.tar.xz ..." |
96 |
- tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die |
97 |
- |
98 |
- if use test; then |
99 |
- einfo "Unpacking parts of ${LLVM_P}.tar.xz ..." |
100 |
- tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \ |
101 |
- "${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die |
102 |
- mv "${LLVM_P}" llvm || die |
103 |
- fi |
104 |
-} |
105 |
- |
106 |
src_configure() { |
107 |
local mycmakeargs=( |
108 |
-DLLDB_DISABLE_CURSES=$(usex !ncurses) |
109 |
|
110 |
diff --git a/dev-util/lldb/lldb-9.0.1.9999.ebuild b/dev-util/lldb/lldb-9.0.1.9999.ebuild |
111 |
index 7279dd54c01..2e9e420b07e 100644 |
112 |
--- a/dev-util/lldb/lldb-9.0.1.9999.ebuild |
113 |
+++ b/dev-util/lldb/lldb-9.0.1.9999.ebuild |
114 |
@@ -4,15 +4,14 @@ |
115 |
EAPI=7 |
116 |
|
117 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
118 |
-inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \ |
119 |
+inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \ |
120 |
toolchain-funcs |
121 |
|
122 |
DESCRIPTION="The LLVM debugger" |
123 |
HOMEPAGE="https://llvm.org/" |
124 |
-SRC_URI="" |
125 |
-EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
126 |
-EGIT_BRANCH="release/9.x" |
127 |
-S=${WORKDIR}/${P}/lldb |
128 |
+LLVM_COMPONENTS=( lldb ) |
129 |
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
130 |
+llvm.org_set_globals |
131 |
|
132 |
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
133 |
SLOT="0" |
134 |
@@ -45,13 +44,6 @@ pkg_setup() { |
135 |
python-single-r1_pkg_setup |
136 |
} |
137 |
|
138 |
-src_unpack() { |
139 |
- local dirs=( lldb ) |
140 |
- use test && dirs+=( llvm/lib/Testing/Support llvm/utils/unittest ) |
141 |
- git-r3_fetch |
142 |
- git-r3_checkout '' '' '' "${dirs[@]}" |
143 |
-} |
144 |
- |
145 |
src_configure() { |
146 |
local mycmakeargs=( |
147 |
-DLLDB_DISABLE_CURSES=$(usex !ncurses) |
148 |
@@ -78,7 +70,7 @@ src_configure() { |
149 |
-DLLDB_TEST_C_COMPILER="$(type -P clang)" |
150 |
-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)" |
151 |
|
152 |
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" |
153 |
+ -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
154 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
155 |
-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
156 |
) |