1 |
commit: 6478051c65ace998185314a4bc041628c0030466 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 1 08:34:38 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 1 13:15:45 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6478051c |
7 |
|
8 |
dev-util/lldb: Switch live to monorepo |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-util/lldb/lldb-10.0.0.9999.ebuild | 20 ++++++-------------- |
13 |
dev-util/lldb/lldb-9.0.1.9999.ebuild | 22 +++++++--------------- |
14 |
2 files changed, 13 insertions(+), 29 deletions(-) |
15 |
|
16 |
diff --git a/dev-util/lldb/lldb-10.0.0.9999.ebuild b/dev-util/lldb/lldb-10.0.0.9999.ebuild |
17 |
index 81f32e23229..63bc879c8b9 100644 |
18 |
--- a/dev-util/lldb/lldb-10.0.0.9999.ebuild |
19 |
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild |
20 |
@@ -14,8 +14,8 @@ inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \ |
21 |
DESCRIPTION="The LLVM debugger" |
22 |
HOMEPAGE="https://llvm.org/" |
23 |
SRC_URI="" |
24 |
-EGIT_REPO_URI="https://git.llvm.org/git/lldb.git |
25 |
- https://github.com/llvm-mirror/lldb.git" |
26 |
+EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
27 |
+S=${WORKDIR}/${P}/lldb |
28 |
|
29 |
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
30 |
SLOT="0" |
31 |
@@ -49,18 +49,10 @@ pkg_setup() { |
32 |
} |
33 |
|
34 |
src_unpack() { |
35 |
- if use test; then |
36 |
- # needed for patched gtest |
37 |
- git-r3_fetch "https://git.llvm.org/git/llvm.git |
38 |
- https://github.com/llvm-mirror/llvm.git" |
39 |
- fi |
40 |
+ local dirs=( lldb ) |
41 |
+ use test && dirs+=( llvm/lib/Testing/Support llvm/utils/unittest ) |
42 |
git-r3_fetch |
43 |
- |
44 |
- if use test; then |
45 |
- git-r3_checkout https://llvm.org/git/llvm.git \ |
46 |
- "${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest |
47 |
- fi |
48 |
- git-r3_checkout |
49 |
+ git-r3_checkout '' '' '' "${dirs[@]}" |
50 |
} |
51 |
|
52 |
src_configure() { |
53 |
@@ -90,7 +82,7 @@ src_configure() { |
54 |
-DLLDB_TEST_C_COMPILER="$(type -P clang)" |
55 |
-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)" |
56 |
|
57 |
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
58 |
+ -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" |
59 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
60 |
-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
61 |
) |
62 |
|
63 |
diff --git a/dev-util/lldb/lldb-9.0.1.9999.ebuild b/dev-util/lldb/lldb-9.0.1.9999.ebuild |
64 |
index 9389776f49b..2b8872f4261 100644 |
65 |
--- a/dev-util/lldb/lldb-9.0.1.9999.ebuild |
66 |
+++ b/dev-util/lldb/lldb-9.0.1.9999.ebuild |
67 |
@@ -14,9 +14,9 @@ inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \ |
68 |
DESCRIPTION="The LLVM debugger" |
69 |
HOMEPAGE="https://llvm.org/" |
70 |
SRC_URI="" |
71 |
-EGIT_REPO_URI="https://git.llvm.org/git/lldb.git |
72 |
- https://github.com/llvm-mirror/lldb.git" |
73 |
-EGIT_BRANCH="release_90" |
74 |
+EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
75 |
+EGIT_BRANCH="release/9.x" |
76 |
+S=${WORKDIR}/${P}/lldb |
77 |
|
78 |
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
79 |
SLOT="0" |
80 |
@@ -50,18 +50,10 @@ pkg_setup() { |
81 |
} |
82 |
|
83 |
src_unpack() { |
84 |
- if use test; then |
85 |
- # needed for patched gtest |
86 |
- git-r3_fetch "https://git.llvm.org/git/llvm.git |
87 |
- https://github.com/llvm-mirror/llvm.git" |
88 |
- fi |
89 |
+ local dirs=( lldb ) |
90 |
+ use test && dirs+=( llvm/lib/Testing/Support llvm/utils/unittest ) |
91 |
git-r3_fetch |
92 |
- |
93 |
- if use test; then |
94 |
- git-r3_checkout https://llvm.org/git/llvm.git \ |
95 |
- "${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest |
96 |
- fi |
97 |
- git-r3_checkout |
98 |
+ git-r3_checkout '' '' '' "${dirs[@]}" |
99 |
} |
100 |
|
101 |
src_configure() { |
102 |
@@ -90,7 +82,7 @@ src_configure() { |
103 |
-DLLDB_TEST_C_COMPILER="$(type -P clang)" |
104 |
-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)" |
105 |
|
106 |
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
107 |
+ -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" |
108 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
109 |
-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
110 |
) |