| 1 |
commit: 36760bd16adda87265f594b93d0eccb91b7b7f79 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 16 18:40:28 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 16 21:52:08 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36760bd1 |
| 7 |
|
| 8 |
sys-devel/clang: Stop enforcing external lit for tests (in <9999) |
| 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 and clang requires it |
| 22 |
anyway for gtest, using the bundled copy has no added cost. |
| 23 |
|
| 24 |
However, the live ebuild is currently broken as it requires llvm-lit |
| 25 |
that is not created in the stand-alone build. This will be fixed |
| 26 |
upstream. |
| 27 |
|
| 28 |
sys-devel/clang/clang-4.0.1.ebuild | 2 -- |
| 29 |
sys-devel/clang/clang-5.0.9999.ebuild | 2 -- |
| 30 |
sys-devel/clang/clang-9999.ebuild | 2 -- |
| 31 |
3 files changed, 6 deletions(-) |
| 32 |
|
| 33 |
diff --git a/sys-devel/clang/clang-4.0.1.ebuild b/sys-devel/clang/clang-4.0.1.ebuild |
| 34 |
index 1c7814d237e..03fb42db1de 100644 |
| 35 |
--- a/sys-devel/clang/clang-4.0.1.ebuild |
| 36 |
+++ b/sys-devel/clang/clang-4.0.1.ebuild |
| 37 |
@@ -38,7 +38,6 @@ RDEPEND=" |
| 38 |
# configparser-3.2 breaks the build (3.3 or none at all are fine) |
| 39 |
DEPEND="${RDEPEND} |
| 40 |
doc? ( dev-python/sphinx ) |
| 41 |
- test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] ) |
| 42 |
xml? ( virtual/pkgconfig ) |
| 43 |
!!<dev-python/configparser-3.3.0.2 |
| 44 |
${PYTHON_DEPS}" |
| 45 |
@@ -142,7 +141,6 @@ multilib_src_configure() { |
| 46 |
) |
| 47 |
use test && mycmakeargs+=( |
| 48 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 49 |
- -DLIT_COMMAND="${EPREFIX}/usr/bin/lit" |
| 50 |
) |
| 51 |
|
| 52 |
if multilib_is_native_abi; then |
| 53 |
|
| 54 |
diff --git a/sys-devel/clang/clang-5.0.9999.ebuild b/sys-devel/clang/clang-5.0.9999.ebuild |
| 55 |
index b8bfe4b8916..46db8c8117a 100644 |
| 56 |
--- a/sys-devel/clang/clang-5.0.9999.ebuild |
| 57 |
+++ b/sys-devel/clang/clang-5.0.9999.ebuild |
| 58 |
@@ -41,7 +41,6 @@ RDEPEND=" |
| 59 |
# configparser-3.2 breaks the build (3.3 or none at all are fine) |
| 60 |
DEPEND="${RDEPEND} |
| 61 |
doc? ( dev-python/sphinx ) |
| 62 |
- test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] ) |
| 63 |
xml? ( virtual/pkgconfig ) |
| 64 |
!!<dev-python/configparser-3.3.0.2 |
| 65 |
${PYTHON_DEPS}" |
| 66 |
@@ -141,7 +140,6 @@ multilib_src_configure() { |
| 67 |
) |
| 68 |
use test && mycmakeargs+=( |
| 69 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 70 |
- -DLIT_COMMAND="${EPREFIX}/usr/bin/lit" |
| 71 |
) |
| 72 |
|
| 73 |
if multilib_is_native_abi; then |
| 74 |
|
| 75 |
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild |
| 76 |
index 178c15c7613..c5211379619 100644 |
| 77 |
--- a/sys-devel/clang/clang-9999.ebuild |
| 78 |
+++ b/sys-devel/clang/clang-9999.ebuild |
| 79 |
@@ -42,7 +42,6 @@ RDEPEND=" |
| 80 |
# configparser-3.2 breaks the build (3.3 or none at all are fine) |
| 81 |
DEPEND="${RDEPEND} |
| 82 |
doc? ( dev-python/sphinx ) |
| 83 |
- test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] ) |
| 84 |
xml? ( virtual/pkgconfig ) |
| 85 |
!!<dev-python/configparser-3.3.0.2 |
| 86 |
${PYTHON_DEPS}" |
| 87 |
@@ -137,7 +136,6 @@ multilib_src_configure() { |
| 88 |
) |
| 89 |
use test && mycmakeargs+=( |
| 90 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 91 |
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 92 |
-DLLVM_LIT_ARGS="-vv" |
| 93 |
) |
Archives