gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sys-devel/clang: Stop enforcing external lit for tests (in <9999)

Browse Source 
Modify the ebuild to no longer enforce externally installed
dev-python/lit for tests, effectively causing the build system to use
the bundled copy of lit (along with llvm-lit). While using the external
package is more canonical, its disadvantages outweight the gain.

Most notably, lit is not slotted in Gentoo and the behavior of lit
frequently changes subtly which caused us to require a major version
match between LLVM and lit. As a result, attempting to build multiple
slots of LLVM with tests enabled cause package collisions. Building both
LLVM and lit simultaneously causes a circular dependency.

Since lit comes from the same package as LLVM and clang requires it
anyway for gtest, using the bundled copy has no added cost.

However, the live ebuild is currently broken as it requires llvm-lit
that is not created in the stand-alone build. This will be fixed
upstream.
This commit is contained in:
Michał Górny
2017-11-16 19:40:28 +01:00
parent 20c1ad8ab9
commit 36760bd16a
3 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys-devel/clang/clang-4.0.1.ebuild
View File

@@ -38,7 +38,6 @@ RDEPEND="
# configparser-3.2 breaks the build (3.3 or none at all are fine)
DEPEND="${RDEPEND}
doc? ( dev-python/sphinx )
test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
xml? ( virtual/pkgconfig )
!!<dev-python/configparser-3.3.0.2
${PYTHON_DEPS}"
@@ -142,7 +141,6 @@ multilib_src_configure() {
)
use test && mycmakeargs+=(
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
)
if multilib_is_native_abi; then

2
sys-devel/clang/clang-5.0.9999.ebuild
View File

@@ -41,7 +41,6 @@ RDEPEND="
# configparser-3.2 breaks the build (3.3 or none at all are fine)
DEPEND="${RDEPEND}
doc? ( dev-python/sphinx )
test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
xml? ( virtual/pkgconfig )
!!<dev-python/configparser-3.3.0.2
${PYTHON_DEPS}"
@@ -141,7 +140,6 @@ multilib_src_configure() {
)
use test && mycmakeargs+=(
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
)
if multilib_is_native_abi; then

2
sys-devel/clang/clang-9999.ebuild
View File

@@ -42,7 +42,6 @@ RDEPEND="
# configparser-3.2 breaks the build (3.3 or none at all are fine)
DEPEND="${RDEPEND}
doc? ( dev-python/sphinx )
test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
xml? ( virtual/pkgconfig )
!!<dev-python/configparser-3.3.0.2
${PYTHON_DEPS}"
@@ -137,7 +136,6 @@ multilib_src_configure() {
)
use test && mycmakeargs+=(
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-DLLVM_LIT_ARGS="-vv"
)