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