workarounds for multilib (x86_64 + x86)

1 files changed, 24 insertions, 12 deletions

diff --git a/sys-devel/llvm/llvm-scm.ebuild b/sys-devel/llvm/llvm-scm.ebuild
index 9338191..46d4b46 100644
--- a/sys-devel/llvm/llvm-scm.ebuild
+++ b/sys-devel/llvm/llvm-scm.ebuild
@@ -53,10 +53,10 @@ DEPEND="${COMMON_DEPEND}
 	!!<dev-python/configparser-3.3.0.2
 	${PYTHON_DEPS}"
 RDEPEND="${COMMON_DEPEND}
-	clang? ( !<=sys-devel/clang-${PV}-r99 )
+	clang? ( >=sys-devel/clang-scm )
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+PDEPEND="clang? ( =sys-devel/clang-scm )"
 
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.
@@ -140,6 +140,17 @@ src_unpack() {
 			"${S}"/tools/clang/tools/extra
 	fi
 	git-r3_checkout
+#	rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \
+#		|| die "symlinks removal failed"
+
+#	if use clang; then
+#		mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \
+#			|| die "clang source directory move failed"
+#		mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \
+#			|| die "compiler-rt source directory move failed"
+#		mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src "${S}"/tools/clang/tools/extra \
+#			|| die "clang-tools-extra source directory move failed"
+#	fi
 }
 
 src_prepare() {
@@ -182,6 +193,11 @@ src_prepare() {
 		-i "${sub_files[@]}" \
 		|| die "install paths sed failed"
 
+	if use clang; then
+		# constantly fails for a long time, likely due to our patches
+		rm tools/clang/test/Driver/cross-linux.c || die
+	fi
+
 	# User patches
 	epatch_user
 
@@ -242,18 +258,17 @@ multilib_src_configure() {
 }
 
 set_makeargs() {
+
 	MAKEARGS=(
 		VERBOSE=1
 		REQUIRES_RTTI=1
 		GENTOO_LIBDIR=$(get_libdir)
 	)
-
-
-	if [ $(get_libdir) = "lib32" ]; then
+    if [ $(get_libdir) = "lib32" ]; then
 	MAKEARGS+=(
 	    CLANG_NO_RUNTIME=1
 	)
-	fi
+    fi
 
 	# for tests, we want it all! otherwise, we may use a little filtering...
 	# adding ONLY_TOOLS also disables unittest building...
@@ -472,14 +487,11 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	pushd utils/vim >/dev/null || die
-	for dir in */; do
-		insinto /usr/share/vim/vimfiles/${dir}
-		doins ${dir}/*.vim
-	done
+#insinto /usr/share/vim/vimfiles/syntax
+#doins utils/vim/*.vim
 
 	if use clang; then
-		pushd tools/clang >/dev/null || die
+		cd tools/clang || die
 
 		if use static-analyzer ; then
 			dobin tools/scan-build/ccc-analyzer