1 |
Signed-off-by: Michał Górny <mgorny@g.o> |
2 |
--- |
3 |
sys-devel/lld/lld-10.0.1.9999.ebuild | 14 ++------------ |
4 |
sys-devel/lld/lld-10.0.1_rc1.ebuild | 14 ++------------ |
5 |
sys-devel/lld/lld-11.0.0.9999.ebuild | 14 ++------------ |
6 |
3 files changed, 6 insertions(+), 36 deletions(-) |
7 |
|
8 |
diff --git a/sys-devel/lld/lld-10.0.1.9999.ebuild b/sys-devel/lld/lld-10.0.1.9999.ebuild |
9 |
index ab0472be1ac9..7b627c88cf1b 100644 |
10 |
--- a/sys-devel/lld/lld-10.0.1.9999.ebuild |
11 |
+++ b/sys-devel/lld/lld-10.0.1.9999.ebuild |
12 |
@@ -4,7 +4,7 @@ |
13 |
EAPI=7 |
14 |
|
15 |
PYTHON_COMPAT=( python3_{6..9} ) |
16 |
-inherit cmake llvm llvm.org multiprocessing python-any-r1 |
17 |
+inherit cmake llvm llvm.org python-any-r1 |
18 |
|
19 |
DESCRIPTION="The LLVM linker (link editor)" |
20 |
HOMEPAGE="https://llvm.org/" |
21 |
@@ -22,9 +22,6 @@ RDEPEND="~sys-devel/llvm-${PV}" |
22 |
DEPEND="${RDEPEND}" |
23 |
BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )" |
24 |
|
25 |
-# least intrusive of all |
26 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
27 |
- |
28 |
python_check_deps() { |
29 |
has_version -b "dev-python/lit[${PYTHON_USEDEP}]" |
30 |
} |
31 |
@@ -34,13 +31,6 @@ pkg_setup() { |
32 |
use test && python-any-r1_pkg_setup |
33 |
} |
34 |
|
35 |
-src_prepare() { |
36 |
- # cmake eclasses suck by forcing ${S} here |
37 |
- CMAKE_USE_DIR=${S} \ |
38 |
- S=${WORKDIR} \ |
39 |
- cmake_src_prepare |
40 |
-} |
41 |
- |
42 |
src_configure() { |
43 |
local mycmakeargs=( |
44 |
-DBUILD_SHARED_LIBS=OFF |
45 |
@@ -51,7 +41,7 @@ src_configure() { |
46 |
-DLLVM_BUILD_TESTS=ON |
47 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
48 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
49 |
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
50 |
+ -DLLVM_LIT_ARGS="$(get_lit_flags)" |
51 |
) |
52 |
|
53 |
cmake_src_configure |
54 |
diff --git a/sys-devel/lld/lld-10.0.1_rc1.ebuild b/sys-devel/lld/lld-10.0.1_rc1.ebuild |
55 |
index ab0472be1ac9..7b627c88cf1b 100644 |
56 |
--- a/sys-devel/lld/lld-10.0.1_rc1.ebuild |
57 |
+++ b/sys-devel/lld/lld-10.0.1_rc1.ebuild |
58 |
@@ -4,7 +4,7 @@ |
59 |
EAPI=7 |
60 |
|
61 |
PYTHON_COMPAT=( python3_{6..9} ) |
62 |
-inherit cmake llvm llvm.org multiprocessing python-any-r1 |
63 |
+inherit cmake llvm llvm.org python-any-r1 |
64 |
|
65 |
DESCRIPTION="The LLVM linker (link editor)" |
66 |
HOMEPAGE="https://llvm.org/" |
67 |
@@ -22,9 +22,6 @@ RDEPEND="~sys-devel/llvm-${PV}" |
68 |
DEPEND="${RDEPEND}" |
69 |
BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )" |
70 |
|
71 |
-# least intrusive of all |
72 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
73 |
- |
74 |
python_check_deps() { |
75 |
has_version -b "dev-python/lit[${PYTHON_USEDEP}]" |
76 |
} |
77 |
@@ -34,13 +31,6 @@ pkg_setup() { |
78 |
use test && python-any-r1_pkg_setup |
79 |
} |
80 |
|
81 |
-src_prepare() { |
82 |
- # cmake eclasses suck by forcing ${S} here |
83 |
- CMAKE_USE_DIR=${S} \ |
84 |
- S=${WORKDIR} \ |
85 |
- cmake_src_prepare |
86 |
-} |
87 |
- |
88 |
src_configure() { |
89 |
local mycmakeargs=( |
90 |
-DBUILD_SHARED_LIBS=OFF |
91 |
@@ -51,7 +41,7 @@ src_configure() { |
92 |
-DLLVM_BUILD_TESTS=ON |
93 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
94 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
95 |
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
96 |
+ -DLLVM_LIT_ARGS="$(get_lit_flags)" |
97 |
) |
98 |
|
99 |
cmake_src_configure |
100 |
diff --git a/sys-devel/lld/lld-11.0.0.9999.ebuild b/sys-devel/lld/lld-11.0.0.9999.ebuild |
101 |
index ab0472be1ac9..7b627c88cf1b 100644 |
102 |
--- a/sys-devel/lld/lld-11.0.0.9999.ebuild |
103 |
+++ b/sys-devel/lld/lld-11.0.0.9999.ebuild |
104 |
@@ -4,7 +4,7 @@ |
105 |
EAPI=7 |
106 |
|
107 |
PYTHON_COMPAT=( python3_{6..9} ) |
108 |
-inherit cmake llvm llvm.org multiprocessing python-any-r1 |
109 |
+inherit cmake llvm llvm.org python-any-r1 |
110 |
|
111 |
DESCRIPTION="The LLVM linker (link editor)" |
112 |
HOMEPAGE="https://llvm.org/" |
113 |
@@ -22,9 +22,6 @@ RDEPEND="~sys-devel/llvm-${PV}" |
114 |
DEPEND="${RDEPEND}" |
115 |
BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )" |
116 |
|
117 |
-# least intrusive of all |
118 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
119 |
- |
120 |
python_check_deps() { |
121 |
has_version -b "dev-python/lit[${PYTHON_USEDEP}]" |
122 |
} |
123 |
@@ -34,13 +31,6 @@ pkg_setup() { |
124 |
use test && python-any-r1_pkg_setup |
125 |
} |
126 |
|
127 |
-src_prepare() { |
128 |
- # cmake eclasses suck by forcing ${S} here |
129 |
- CMAKE_USE_DIR=${S} \ |
130 |
- S=${WORKDIR} \ |
131 |
- cmake_src_prepare |
132 |
-} |
133 |
- |
134 |
src_configure() { |
135 |
local mycmakeargs=( |
136 |
-DBUILD_SHARED_LIBS=OFF |
137 |
@@ -51,7 +41,7 @@ src_configure() { |
138 |
-DLLVM_BUILD_TESTS=ON |
139 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
140 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
141 |
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
142 |
+ -DLLVM_LIT_ARGS="$(get_lit_flags)" |
143 |
) |
144 |
|
145 |
cmake_src_configure |
146 |
-- |
147 |
2.27.0 |