sys-devel/llvm: Stop installing llvm-lit

Stop installing lit as llvm-lit since the correct install layout is still unclear (wrt https://reviews.llvm.org/D23743), installed version search is inconsistent and broken, and all reverse dependencies require LLVM source checkout anyway and therefore use the internal lit package included in it. The install will eventually be addressed later, most likely as a split package.
johu · Sep 2, 2016 · a1621d0 · a1621d0
1 parent d236c73
commit a1621d0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 83 deletions.
diff --git a/sys-devel/llvm/files/9999/0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch b/sys-devel/llvm/files/9999/0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch
diff --git a/sys-devel/llvm/files/9999/0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch b/sys-devel/llvm/files/9999/0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
@@ -7,11 +7,10 @@ EAPI=6
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 # (needed due to lib32 find_library fix)
 CMAKE_MIN_VERSION=3.6.1-r1
-DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python2_7 )
 
-inherit check-reqs cmake-utils distutils-r1 flag-o-matic git-r3 \
-	multilib-minimal pax-utils toolchain-funcs
+inherit check-reqs cmake-utils flag-o-matic git-r3 \
+	multilib-minimal pax-utils python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="http://llvm.org/"
@@ -25,7 +24,6 @@ KEYWORDS=""
 IUSE="debug +doc gold libedit +libffi multitarget ncurses ocaml test
 	video_cards_radeon elibc_musl kernel_Darwin"
 
-# python is needed for llvm-lit (which is installed)
 RDEPEND="
 	sys-libs/zlib:0=
 	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
@@ -35,8 +33,7 @@ RDEPEND="
 	ocaml? (
 		>=dev-lang/ocaml-4.00.0:0=
 		dev-ml/findlib
-		dev-ml/ocaml-ctypes )
-	${PYTHON_DEPS}"
+		dev-ml/ocaml-ctypes )"
 # configparser-3.2 breaks the build (3.3 or none at all are fine)
 DEPEND="${RDEPEND}
 	dev-lang/perl
@@ -49,7 +46,8 @@ DEPEND="${RDEPEND}
 	gold? ( sys-libs/binutils-libs )
 	libffi? ( virtual/pkgconfig )
 	ocaml? ( test? ( dev-ml/ounit ) )
-	!!<dev-python/configparser-3.3.0.2"
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -113,11 +111,6 @@ src_prepare() {
 	# https://bugs.gentoo.org/show_bug.cgi?id=578392
 	eapply "${FILESDIR}"/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch
 
-	# Fix lit tests to find installed llvm-lit correctly
-	eapply "${FILESDIR}"/9999/0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch
-	# Install lit as llvm-lit (as expected by cmake)
-	eapply "${FILESDIR}"/9999/0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch
-
 	# support building llvm against musl-libc
 	use elibc_musl && eapply "${FILESDIR}"/9999/musl-fixes.patch
 
@@ -225,10 +218,6 @@ multilib_src_compile() {
 		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
 		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
 	fi
-
-	# Run setup.py for lit
-	cd "${S}"/utils/lit || die
-	distutils-r1_src_compile
 }
 
 multilib_src_test() {
@@ -247,10 +236,6 @@ src_install() {
 	)
 
 	multilib-minimal_src_install
-
-	# Install lit
-	cd "${S}"/utils/lit || die
-	distutils-r1_src_install
 }
 
 multilib_src_install() {