1 |
commit: bffe6a1dd3106ea8c2c1a1a0527f3f650c303341 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 16 16:53:29 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 16 21:52:07 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bffe6a1d |
7 |
|
8 |
sys-devel/llvm: Stop enforcing external lit for tests |
9 |
|
10 |
Modify the ebuild to no longer enforce externally installed |
11 |
dev-python/lit for tests, effectively causing the build system to use |
12 |
the bundled copy of lit (along with llvm-lit). While using the external |
13 |
package is more canonical, its disadvantages outweight the gain. |
14 |
|
15 |
Most notably, lit is not slotted in Gentoo and the behavior of lit |
16 |
frequently changes subtly which caused us to require a major version |
17 |
match between LLVM and lit. As a result, attempting to build multiple |
18 |
slots of LLVM with tests enabled cause package collisions. Building both |
19 |
LLVM and lit simultaneously causes a circular dependency. |
20 |
|
21 |
Since lit comes from the same package as LLVM itself and LLVM requires |
22 |
explicit python-any-r1 use anyway, using the bundled copy has no added |
23 |
cost. It reduces the risk of breakage resulting from skipping llvm-lit |
24 |
wrapper and solves the forementioned problems caused by depending |
25 |
on dev-python/lit. |
26 |
|
27 |
The external package is still useful for projects that do not require |
28 |
LLVM sources. |
29 |
|
30 |
sys-devel/llvm/llvm-4.0.1.ebuild | 10 ---------- |
31 |
sys-devel/llvm/llvm-5.0.9999.ebuild | 10 ---------- |
32 |
sys-devel/llvm/llvm-9999.ebuild | 7 ------- |
33 |
3 files changed, 27 deletions(-) |
34 |
|
35 |
diff --git a/sys-devel/llvm/llvm-4.0.1.ebuild b/sys-devel/llvm/llvm-4.0.1.ebuild |
36 |
index 4e3e2dcbed0..6eca3552280 100644 |
37 |
--- a/sys-devel/llvm/llvm-4.0.1.ebuild |
38 |
+++ b/sys-devel/llvm/llvm-4.0.1.ebuild |
39 |
@@ -53,7 +53,6 @@ DEPEND="${RDEPEND} |
40 |
doc? ( dev-python/sphinx ) |
41 |
gold? ( sys-libs/binutils-libs ) |
42 |
libffi? ( virtual/pkgconfig ) |
43 |
- test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") ) |
44 |
!!<dev-python/configparser-3.3.0.2 |
45 |
${PYTHON_DEPS}" |
46 |
# There are no file collisions between these versions but having :0 |
47 |
@@ -71,11 +70,6 @@ S=${WORKDIR}/${P/_/}.src |
48 |
# least intrusive of all |
49 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
50 |
|
51 |
-python_check_deps() { |
52 |
- ! use test \ |
53 |
- || has_version "dev-python/lit[${PYTHON_USEDEP}]" |
54 |
-} |
55 |
- |
56 |
src_prepare() { |
57 |
# Fix llvm-config for shared linking and sane flags |
58 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
59 |
@@ -133,10 +127,6 @@ multilib_src_configure() { |
60 |
) |
61 |
# fi |
62 |
|
63 |
- use test && mycmakeargs+=( |
64 |
- -DLIT_COMMAND="${EPREFIX}/usr/bin/lit" |
65 |
- ) |
66 |
- |
67 |
if multilib_is_native_abi; then |
68 |
mycmakeargs+=( |
69 |
-DLLVM_BUILD_DOCS=$(usex doc) |
70 |
|
71 |
diff --git a/sys-devel/llvm/llvm-5.0.9999.ebuild b/sys-devel/llvm/llvm-5.0.9999.ebuild |
72 |
index cbd8b43b170..3bf676e4360 100644 |
73 |
--- a/sys-devel/llvm/llvm-5.0.9999.ebuild |
74 |
+++ b/sys-devel/llvm/llvm-5.0.9999.ebuild |
75 |
@@ -55,7 +55,6 @@ DEPEND="${RDEPEND} |
76 |
doc? ( dev-python/sphinx ) |
77 |
gold? ( sys-libs/binutils-libs ) |
78 |
libffi? ( virtual/pkgconfig ) |
79 |
- test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") ) |
80 |
!!<dev-python/configparser-3.3.0.2 |
81 |
${PYTHON_DEPS}" |
82 |
# There are no file collisions between these versions but having :0 |
83 |
@@ -71,11 +70,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
84 |
# least intrusive of all |
85 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
86 |
|
87 |
-python_check_deps() { |
88 |
- ! use test \ |
89 |
- || has_version "dev-python/lit[${PYTHON_USEDEP}]" |
90 |
-} |
91 |
- |
92 |
src_prepare() { |
93 |
# Fix llvm-config for shared linking and sane flags |
94 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
95 |
@@ -133,10 +127,6 @@ multilib_src_configure() { |
96 |
) |
97 |
# fi |
98 |
|
99 |
- use test && mycmakeargs+=( |
100 |
- -DLIT_COMMAND="${EPREFIX}/usr/bin/lit" |
101 |
- ) |
102 |
- |
103 |
if multilib_is_native_abi; then |
104 |
mycmakeargs+=( |
105 |
-DLLVM_BUILD_DOCS=$(usex doc) |
106 |
|
107 |
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild |
108 |
index 64f66a7d6c0..af9daf563fa 100644 |
109 |
--- a/sys-devel/llvm/llvm-9999.ebuild |
110 |
+++ b/sys-devel/llvm/llvm-9999.ebuild |
111 |
@@ -57,7 +57,6 @@ DEPEND="${RDEPEND} |
112 |
doc? ( dev-python/sphinx ) |
113 |
gold? ( sys-libs/binutils-libs ) |
114 |
libffi? ( virtual/pkgconfig ) |
115 |
- test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") ) |
116 |
!!<dev-python/configparser-3.3.0.2 |
117 |
${PYTHON_DEPS}" |
118 |
# There are no file collisions between these versions but having :0 |
119 |
@@ -73,11 +72,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
120 |
# least intrusive of all |
121 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
122 |
|
123 |
-python_check_deps() { |
124 |
- ! use test \ |
125 |
- || has_version "dev-python/lit[${PYTHON_USEDEP}]" |
126 |
-} |
127 |
- |
128 |
src_prepare() { |
129 |
# Fix llvm-config for shared linking and sane flags |
130 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
131 |
@@ -139,7 +133,6 @@ multilib_src_configure() { |
132 |
# fi |
133 |
|
134 |
use test && mycmakeargs+=( |
135 |
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
136 |
-DLLVM_LIT_ARGS="-vv" |
137 |
) |