sys-devel/llvm: llvm-3.7.1-r1 prefix support.

3 files changed, 31 insertions, 6 deletions

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 475c494..ed193fa 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -4,6 +4,7 @@ AUX clang-3.1-gentoo-runtime-gcc-detection-v3.patch 1457 SHA256 f4b22281d21e39bc
 AUX clang-3.3-gcc-header-path.patch 4309 SHA256 56e51c30b91f0ff264c27e332c5375672c035b8271a64860b9e940c918ebf7ac SHA512 568c82c34b56bd18e34122975a420f38ae9f190c9efec00383aa0802c1810297b1fef94a21093775ee20c4b30ad5800b4bbebd26e5cbc9358b11ce7b5165ac41 WHIRLPOOL 2ea6ba49110d6f0bb1f3c6f93f6788463cfcf67b19d9397a69ab4066d3fc1106d544bedc24668a5e515df561e992a7d59a27253a08fae02e622aad36962ace8f
 AUX clang-3.3-gentoo-install.patch 2815 SHA256 76a3ce245b1fb9cc5d391934755d27e248bdcbb9581ab7931287e75bf626aad5 SHA512 8105461ff031a7dc00e2a8ca9939afb56525bdc065beff7bb06f22525cb6ecf6b8196a1e0ac11fa3895dc29b4f04c24f61c5492859f23785285517775f3d69b6 WHIRLPOOL dbb5fc2596bee19ec9fff0c14b4a9e087a6ba4e3af115da956c43772cf44f2f480a21f86b15ec3890d74cc3fa3b9cb4e3bdbee341677fb8e79a640b0a5c8f6fa
 AUX clang-3.4-darwin_build_fix.patch 1876 SHA256 b2fe85911006affc8ac5fc68496c45845872cf4b37445910b8d10a5bfbe77fcc SHA512 54841b590e14b84f90b00ec782785181018196d076764e4048960d1321d18aac388e1220bdc70b10432dfb5fcad5a43af6c33124ec93df8bc3a724cceeee9260 WHIRLPOOL 8c1373a558619be095427d7986246524e5f7c1239ee706234debc2add1f03626d630a1e5216bdc7127f0b833eca791fae666765a27d394ecc55d394492f424ab
+AUX clang-3.4-darwin_prefix-include-paths.patch 714 SHA256 a1e3f34d225e4b0503fa2bccb85e53e80f682a3171ec726629749f7fe7e725ed SHA512 00a364352cfeb6c18f825045af21c3de9d501403b416fba2380dff0e3bed957ec42cda35ca13b718fe3854c26264578ecf4beb295a374d5afcd620b87dc44cea WHIRLPOOL 816c6377c8a17dadf91380c19dbf337d1f5e71733da6f2e1f79714a2fbeee8f37ad6f0ad1bb449061771d317b8bada044fdfe22197f6c3de2ec2708c9cdaac09
 AUX clang-3.4-gentoo-install.patch 3228 SHA256 051799f114102aa46717dc4a7224c878f7511b69a06090c501abe157c6025c5d SHA512 35127c66182ee1f698bf96731c11679c3fe162d9dcb524c06467598b374fcce94dd0484723acc0072ab1565c581e2fc74d6b7246484bfd9bf1511eb419a85c9b WHIRLPOOL 3d1644da31e9278bf0983bcaf1947b99570e71366b6cc868020c5978037795c27ae211c4d32562dfc1933ff2a4e9f8c0aab0248ac9c6c69fc954a830502d3f68
 AUX clang-3.5-gentoo-install.patch 2166 SHA256 e359a219f2d0d2b88094bbb5ab91fd50d9662686f77e85b7ccfb8d1c4a6fd39d SHA512 07e5b3d4131a7d58577bcb99a82c585258c98a38e71b7e8dda058b467a558471e1ddeec5c9f5492f5d17e280cd4b09e49338e0926dd2534583bc8a2772bce26d WHIRLPOOL 5582b2015b4d3e845a45bfda08c156683df11685170f253f79ccf016f2e771b016d213417d83068f01a41bd8e0148474711cd6f9b7187e758322e9ebb9c390dd
 AUX clang-3.5-gentoo-runtime-gcc-detection-v3.patch 1694 SHA256 24691db819d08f87f0144a67900ae6797c0df4d180b55acc5c377d890ac2e72e SHA512 a34f694560ef0c7366ad0dc243a479afc74b6122d624b8681538da69c70d0d1869245a89c61d49add890c5f76134281470f5e75a59e6fc9ac963230fc56fe8e6 WHIRLPOOL 4f4af09e08c7d5af89558e77d0a2a4542f77ae505e9020ca6e48e20ef71c4db6016ed0211b2a303b756994f62949c91c216cc2f81b16ff65c71414d354977c8f
@@ -97,6 +98,6 @@ EBUILD llvm-3.6.1.ebuild 15554 SHA256 f1f007fa874bc33f5c1cdc9622ba17badc64d03fa9
 EBUILD llvm-3.6.2.ebuild 15791 SHA256 91585a09b6955349b227f94a71c6ac564b7e9a3701dc151745967ca2248b96c0 SHA512 8b52a8b2f321f9508398368194710db12545904fbc5ef01e3f3ad16800644f67609916a09aa2753fa23f3c1add7997b2d9e4bb1cc95a2cb87fd5ed01cb957b46 WHIRLPOOL 1c58a81dba8c63b0d92f29eaf309780548f34c730c181107625e04f60831387986089c42e49c0f284faf781cf0bb00368d24e043e4800caa03b34430f5d55a09
 EBUILD llvm-3.7.0-r1.ebuild 14656 SHA256 fe5040ed23d8d368e812be09f200767e914849fd300edfc1c80bd7bba10d99a4 SHA512 0d1c09b05f9e6b57f13f6ca1a6f26f523f25e2b57d56e8199c78706a670be489fe9e6b4da0e7c473bcb79bfc60e9daf6e90673e6445fa8da79341e9644a7ae32 WHIRLPOOL 84ddcc6c94f51e59d8b6444e89bdd2d72d4411a3bb5c38d010a0560993e0ed36235b67209d389e361e9e645c2c151337414eb3db634aba4851372c15320268d8
 EBUILD llvm-3.7.0.ebuild 14056 SHA256 12f9a4b1a178b193a5cab94c00f448eb538d31056d5e34915a173caf52ea0b87 SHA512 1951a8ab684aaa9de60a2a1b86534cc57ea56bf4d3deb82a8638685f09b0ff3b01c86fafeb8514d4df24892119eba1a69cf2bf99ca12d584f9eb455f3a74448f WHIRLPOOL 9ebf4aa05d6fdaf3e5fb690d75a3996229214197f057dd4695dff0e7dac49492b4b292ce0497dcd8dcd64bdc2975b08540cbc3f458350b1f412f040a6505e7b8
-EBUILD llvm-3.7.1-r1.ebuild 15938 SHA256 2e4e8a0748464181f2a9281a9fb15c7070c07174e595e798d133d5544523d2c8 SHA512 f10412a2328bbe32d626ecb946682aafcb9cf8a428cecda9d92fce5e87ffa71cfe90f066a37ccfbc9a9b5e79e9f15cc355ab15b9379b5420cc96226885c5c507 WHIRLPOOL 24578150827c1473a9701bf35b5d059e3db6fbc0715a053c5a8bd160f8057fd07df6d7e41d5f27d2c37613a2eba2f5d176ef8d8e70b01d164fe4e639f1010e83
+EBUILD llvm-3.7.1-r1.ebuild 16167 SHA256 c7d895327deea82d9067a787823615bb3d4d169f938a68e0670caeae98f1ca7e SHA512 88bbcd62b02aa9a0039a94e28aa67980e62ce8f42d9e99627a3821a82ed9cd1bd7632bc28a2202473c91c051978fbc0cb5dbd107a7c5d520174e8483c2c58ca0 WHIRLPOOL 6bf31fc553129989eadb64dd391d1f60c023280bdc134bbd934d2a418827d677700b6ec847a41d61c85a5e58c9033558613351fd4c66baddab85e312acaebeac
 EBUILD llvm-9999.ebuild 13970 SHA256 cbdb999ccbf7a8be6a986a23f3cb38de22bfdb0eb9fe05bc08dd72c84a4b75d9 SHA512 d7ccb82b1b3ddac2abd0aeaacf14717aa33f075d703aa993e8f3eae928a6aff4c67c00b7a194f8f365e3b225e4fde6391e8fe72daf34d4b2d84a4d78fe6533c2 WHIRLPOOL 50a961dea8e4fd2956d47cf9345a8c4944895dd60fe87cdce3371019c04f19783ed3e84d059dabd8b26b1486f10e8df51cc027e8f15e70e21fc71db25248829c
 MISC metadata.xml 2785 SHA256 7329cb36d95ea94ccabceb9d228eb77cb3186e53b360dc27717393338d4147fc SHA512 3acac76248322ac92fae2a4cde7fa113b356f43bafabd5bd99d6937b4f9a39f74676de65c17cd8df634b65052a0777f6336aed598ccc1dd17a97a564096ae9d5 WHIRLPOOL 87d38e5091fc1ea70282a637864a268a928acb40b3b4c962cca543a48adf78ad035f391bba4099983fa1384854052966bcf1d839bdfa72c9081f876d5478c800
diff --git a/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch b/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch
new file mode 100644
index 0000000..ed332f3
--- /dev/null
+++ b/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch
@@ -0,0 +1,18 @@
+--- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp
++++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp
+@@ -233,6 +233,7 @@
+     case llvm::Triple::Bitrig:
+       break;
+     default:
++      AddPath("@GENTOO_PORTAGE_EPREFIX@/usr/include", System, false);
+       // FIXME: temporary hack: hard-coded paths.
+       AddPath("/usr/local/include", System, false);
+       break;
+@@ -505,6 +506,7 @@
+   // Add the default framework include paths on Darwin.
+   if (HSOpts.UseStandardSystemIncludes) {
+     if (triple.isOSDarwin()) {
++      AddPath("@GENTOO_PORTAGE_EPREFIX@/Frameworks", System, true);
+       AddPath("/System/Library/Frameworks", System, true);
+       AddPath("/Library/Frameworks", System, true);
+     }
diff --git a/sys-devel/llvm/llvm-3.7.1-r1.ebuild b/sys-devel/llvm/llvm-3.7.1-r1.ebuild
index 7bd5432..58b7c72 100644
--- a/sys-devel/llvm/llvm-3.7.1-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 PYTHON_COMPAT=( python2_7 )
 
-inherit check-reqs cmake-utils eutils flag-o-matic multilib \
+inherit check-reqs cmake-utils eutils flag-o-matic multilib linux-info \
 	multilib-minimal python-single-r1 toolchain-funcs pax-utils prefix
 
 DESCRIPTION="Low Level Virtual Machine"
@@ -24,7 +24,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml
 	python +static-analyzer test xml video_cards_radeon
-	kernel_Darwin kernel_FreeBSD"
+	kernel_Darwin kernel_FreeBSD rap"
 
 COMMON_DEPEND="
 	sys-libs/zlib:0=
@@ -232,6 +232,13 @@ src_prepare() {
 	# User patches
 	eapply_user
 
+	if kernel_is -lt 2 6 32; then
+		# on RHEL5, linux/perf_event.h (needing kernel >=2.6.32) is not available.
+		# https://llvm.org/bugs/show_bug.cgi?id=17901
+		elog "Removing compiler-rt on <linux-2.6.32..."
+		rm -r projects/compiler-rt || die "Removing compiler-rt failed."
+	fi
+
 	python_setup
 
 	# Native libdir is used to hold LLVMgold.so
@@ -278,6 +285,8 @@ multilib_src_configure() {
 		-DHAVE_HISTEDIT_H=$(usex libedit)
 	)
 
+	use rap && mycmakeargs+=( -DDEFAULT_SYSROOT="${EPREFIX}" )
+
 	if use clang; then
 		mycmakeargs+=(
 			-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
@@ -528,9 +537,6 @@ multilib_src_install_all() {
 			popd >/dev/null || die
 		fi
 
-		# AddressSanitizer symbolizer (currently separate)
-		dobin "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
-
 		popd >/dev/null || die
 
 		python_fix_shebang "${ED}"