1 |
commit: 20c1ad8ab928a4593bc76c940ef40f0c0183e4e1 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 16 17:00:19 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=20c1ad8a |
7 |
|
8 |
dev-ml/llvm-ocaml: 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. Furthermore, in the current git version the additional |
24 |
(fine-grained) test rules do not work correctly without llvm-lit, making |
25 |
it impossible to run LLVM binding tests separately. |
26 |
|
27 |
dev-ml/llvm-ocaml/llvm-ocaml-4.0.1.ebuild | 12 +----------- |
28 |
dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild | 12 +----------- |
29 |
dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild | 9 +-------- |
30 |
3 files changed, 3 insertions(+), 30 deletions(-) |
31 |
|
32 |
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-4.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-4.0.1.ebuild |
33 |
index 6375c108d85..5eda59e817e 100644 |
34 |
--- a/dev-ml/llvm-ocaml/llvm-ocaml-4.0.1.ebuild |
35 |
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-4.0.1.ebuild |
36 |
@@ -35,8 +35,7 @@ RDEPEND=" |
37 |
DEPEND="${RDEPEND} |
38 |
dev-lang/perl |
39 |
dev-ml/findlib |
40 |
- test? ( dev-ml/ounit |
41 |
- $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") ) |
42 |
+ test? ( dev-ml/ounit ) |
43 |
!!<dev-python/configparser-3.3.0.2 |
44 |
${PYTHON_DEPS}" |
45 |
|
46 |
@@ -48,11 +47,6 @@ S=${WORKDIR}/${MY_P/_/}.src |
47 |
# least intrusive of all |
48 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
49 |
|
50 |
-python_check_deps() { |
51 |
- ! use test \ |
52 |
- || has_version "dev-python/lit[${PYTHON_USEDEP}]" |
53 |
-} |
54 |
- |
55 |
pkg_setup() { |
56 |
LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup |
57 |
python-any-r1_pkg_setup |
58 |
@@ -92,10 +86,6 @@ src_configure() { |
59 |
# TODO: ocamldoc |
60 |
) |
61 |
|
62 |
- use test && mycmakeargs+=( |
63 |
- -DLIT_COMMAND="${EPREFIX}/usr/bin/lit" |
64 |
- ) |
65 |
- |
66 |
cmake-utils_src_configure |
67 |
|
68 |
local llvm_libdir=$(llvm-config --libdir) |
69 |
|
70 |
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild |
71 |
index 0c2ad271f5c..b7e7d9839de 100644 |
72 |
--- a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild |
73 |
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild |
74 |
@@ -37,8 +37,7 @@ RDEPEND=" |
75 |
DEPEND="${RDEPEND} |
76 |
dev-lang/perl |
77 |
dev-ml/findlib |
78 |
- test? ( dev-ml/ounit |
79 |
- $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") ) |
80 |
+ test? ( dev-ml/ounit ) |
81 |
!!<dev-python/configparser-3.3.0.2 |
82 |
${PYTHON_DEPS}" |
83 |
|
84 |
@@ -48,11 +47,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
85 |
# least intrusive of all |
86 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
87 |
|
88 |
-python_check_deps() { |
89 |
- ! use test \ |
90 |
- || has_version "dev-python/lit[${PYTHON_USEDEP}]" |
91 |
-} |
92 |
- |
93 |
pkg_setup() { |
94 |
LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup |
95 |
python-any-r1_pkg_setup |
96 |
@@ -92,10 +86,6 @@ src_configure() { |
97 |
# TODO: ocamldoc |
98 |
) |
99 |
|
100 |
- use test && mycmakeargs+=( |
101 |
- -DLIT_COMMAND="${EPREFIX}/usr/bin/lit" |
102 |
- ) |
103 |
- |
104 |
# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 |
105 |
# also: custom rules for OCaml do not work for CPPFLAGS |
106 |
use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG" |
107 |
|
108 |
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild |
109 |
index 7bb17679f8d..2fa7019d717 100644 |
110 |
--- a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild |
111 |
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild |
112 |
@@ -38,8 +38,7 @@ RDEPEND=" |
113 |
DEPEND="${RDEPEND} |
114 |
dev-lang/perl |
115 |
dev-ml/findlib |
116 |
- test? ( dev-ml/ounit |
117 |
- $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") ) |
118 |
+ test? ( dev-ml/ounit ) |
119 |
!!<dev-python/configparser-3.3.0.2 |
120 |
${PYTHON_DEPS}" |
121 |
|
122 |
@@ -49,11 +48,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
123 |
# least intrusive of all |
124 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
125 |
|
126 |
-python_check_deps() { |
127 |
- ! use test \ |
128 |
- || has_version "dev-python/lit[${PYTHON_USEDEP}]" |
129 |
-} |
130 |
- |
131 |
pkg_setup() { |
132 |
llvm_pkg_setup |
133 |
python-any-r1_pkg_setup |
134 |
@@ -97,7 +91,6 @@ src_configure() { |
135 |
) |
136 |
|
137 |
use test && mycmakeargs+=( |
138 |
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
139 |
-DLLVM_LIT_ARGS="-vv" |
140 |
) |