[patch] Proposed (untested yet) patch

llvm-cmake.patch (text/plain), 6.76 KB, created by Michał Górny on 2013-12-20 00:01:00 UTC

Index: Manifest
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/Manifest,v
retrieving revision 1.156
diff -u -B -r1.156 Manifest
--- Manifest	19 Dec 2013 19:08:31 -0000	1.156
+++ Manifest	19 Dec 2013 23:59:25 -0000
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX cl-patches/0001-r600-Add-some-intrinsic-definitions.patch 2450 SHA256 b0a718800c8969e174f3a22e61c15a370376f477e031fe97fff6aaab152f9867 SHA512 d23f9645d3e3364b1e9ce522eb15022fd3f2a685741db88b117b409ee33a07344a8e9ba9d89dc3535e5289edf79c6beb7ff144659f4e725b1a8f2c4256f9aad0 WHIRLPOOL c549806dbe5309dc441b65c942de488c6afc8c511d060d5c1459a4f99b97a357acbec51ce51bd704e5e1e74437cd413755f15377ad6b96c235242bc370af096f
 AUX cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch 1189 SHA256 172bbb3cb1214e61ee2684c133317bb997e94a34c91dae94d4848cbd0c216436 SHA512 cf711149c421b4258bc64b81018d0a9474d8b4e4128d0cc0cea788b54c93e9512397b2310db8a1834c3507b4d893d5743dbc53183ac0daca23da55601b976c16 WHIRLPOOL 8e6bd9f005a6a941c55d7c8d9b127826191944fab9e404f8ed958efd07017f5f9301273739f869a73f15fc2a79af9dc18687ff85403acf24e175a464838b3f2e
 AUX clang-3.1-gentoo-runtime-gcc-detection-v3.patch 1457 SHA256 f4b22281d21e39bc4681519cec90243c0e50262ce56ae68b0a8d9e7d92ce0375 SHA512 81c582791f4b0b1ccfcf3e8c82fbb68312320c5287402236d8c6d2d76767bbba031094c26d2b7bd9581c473896b78dda5a6284c5a87726e1bc0c539ae9294763 WHIRLPOOL bb68797804c89f8797561964697a72a015daf2c951d92f490f8c83f38aac6f50ce1527f39b53ccc6a3d93f84ec8f868e40340a5472b9e7ee4c34ceaa4b9ca845
@@ -45,25 +42,6 @@
 EBUILD llvm-3.2.ebuild 6534 SHA256 eb16cc91887fdb035722d268caaa3e4843825403786fcf74643be2c6f8099f11 SHA512 e781a4e4416a4acee667029744dab7f8e52022df4fcbb89d4d9acf855549f1c0a1661b79ee0067fd052a36bad278f08a2ff7f6e6e44d8c3ea7f82910ac573d9b WHIRLPOOL 115d13959a22867266dd7c0133109ccba063e97972cc2c807fb7a6dd7d3fbef1726caf314e262f6683a97a2c3a6ff776f808de7d80923472fc692554eccbca27
 EBUILD llvm-3.3-r1.ebuild 12007 SHA256 343a88ba35b67f4d86c20e29e1f4919640a9c4fbf9942fb1733945480ba1e8f5 SHA512 3db9e2ad26e803ac663b696ff615eed83a4342e4b771f161b74304bb83c61f171e02f2b176cf62663724206a57e20be52ec22cf49de234f72b32673bb2588512 WHIRLPOOL 1c423485f6161b40daa5a7ebdc38838b4bd2d6a9c540881eb3cfbf5f592b454da32758ad23c2607fe7a875c65891f7b64f3079a53ac77af5b2decb6490a6b8b4
 EBUILD llvm-3.3.ebuild 6798 SHA256 4e53042e76ce97e6a460cda74c5dbadc1cee9009345e8f0232e28d53c8f77579 SHA512 5513887c3b5a25a678713b68c216a40801ddecbf5a4dc58d7ad01c1ec8411589e20d8662c34f117e6d64924302504c8ce74b48f3edca1f292b56881eb6176271 WHIRLPOOL 79d6adefc281699477a271f76cb8eb7992d0946b6fcda9149a0976c30138ac882f735eff08c25c0edf37ccc8e31700f6d2d51d38c354c82c06695962e8f9243b
-EBUILD llvm-9999.ebuild 11884 SHA256 98150d312855e4e2f3f50236ec134a7655f96a757895de33f28ceab5a8762ef8 SHA512 a097810e7ba3d2029f026a4f8a69e0bd350a3c13c2d43a3e74e48d5590535112cb545b8613593d40c66704a6437d13996881daa319f1026222174e6a18cc19f8 WHIRLPOOL e9688a911f377fa4024eb8cd7df4eef2d0d5f2af693800a7f769e40cb90b8a3e4366658f1b56bbbba3d072e15ab4c97fa7595f6948d78e40afc05d31123c3ca1
+EBUILD llvm-9999.ebuild 12544 SHA256 0bf6d4344a01658d2bd935fd9170c1fba1af563953f3bc40b93ba81cf4b3ea04 SHA512 7cda2eae0b92b50fbefe10961be51cca1c79a184cade640ec1d8309f9c3651f2f9774ef44010d98cff359703e27a59f835d55b13a41c62af6b719aa05be3d5cc WHIRLPOOL 1d5dd13a76696361a1504e257cfd91104459463245680bfaa64795c87afa47db9e7cf0df1ab35fd60ed8ba60be3668020ce16c4c175a7ad1a43d62322d53edee
 MISC ChangeLog 25641 SHA256 fe380faa857882fece0df873884d209b9cd610925ca5a8eff99d777fca05465b SHA512 ef79e5b53db0d1ff9a9d07e8806364cceeb7f9ada6bcc286c426bc218baf3cd709213b07c0e96769b4abb9abd3f53bf8268653755dd21fd2c524062e60baf41d WHIRLPOOL e24284e9685d5868f5b987dc32337a377abd5cb195d0a638a6ec0d89da82118f968cbfae10335329d06a71e889131e8d01c099e3dbaff82c3df5fb9b545d97a7
 MISC metadata.xml 2723 SHA256 d1bbe72da2553592ad60522f744b8339bce17487343abf372d966c1fe9cd163d SHA512 800f72039a5f0fdb175a8ddab7ae8f184907865802ffd5f139006f3a8c77053f114e2f7b01cef3f41f6fffb3f8f8b2b474fdf95461f27b2dc8ae31cbd732a14e WHIRLPOOL 462d3d2f22e29d3678621a9f89ed98a58ee60fde57da7be21fbca7fd61e106abbcb19c0e491424869302c19ca93b15c480cd7ca2a3181f2148174d44e891e190
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQJ8BAEBCABmBQJSs0QuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOSd4P/jnyZwUUKvEXyUAm2QhsnA9w
-8OoNGDpFsyrGzUN7ZYYkDlpJtUQ4WT2lHiuJfjrHdB8xgqtLws7t3PD7CupE7szd
-yNy+PRFehKP2ZVI0UUDilV+Xa2Fgzk7f2dkKKPoC7lJUFh56abXV7wqKz7hRNdc4
-54foy/nuJdi+yJl+wPM9AlBFOilOnBkc9fqvm78WwO9IjMsldIc1ck9aK85V2Brp
-rRuTD86HDe41MNpUTEj0B8jYom68yFIc1YJZeH71s1hHveT1VMWZSjSUnVM8Qn8g
-IhhiKM/6TWg1jbe8MhxBp/kxyixyMbchp4HAZ2dEuD9Vnv+eW+Ggumul1dAZ2JzU
-VmSuNWHJKsxH+qH7QVl+nK7UUgGMczzCcaFs3hKI64xXf0ZJdSchA/BmN96020ja
-fpB1flR9HEVd2GNECkdhKpNGHTl0DK32jZT94b7HqsJLufi9a/hQiwPTgOREBDdM
-bhe2CRmW9o6nIa/t2QRZx1YnxFjpYppcDMJJHbJ5nPUTVxgpM1T3k60mpXldzuoO
-ObopnUoUhJ2OmdsEfY8y9SyiK32MOKCWJ7hWDrka5DASXSYgAyqJm7T4ChCva9bM
-x0qhBukTaErCrK/nd7V0d2MQGCKkX9vB/FdFCE4AlTo+BFc1zB2rK/cB9dSEA2su
-s37e0Lkr9apoEUX3X+o4
-=bd6B
------END PGP SIGNATURE-----
Index: llvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v
retrieving revision 1.66
diff -u -B -r1.66 llvm-9999.ebuild
--- llvm-9999.ebuild	19 Dec 2013 19:08:25 -0000	1.66
+++ llvm-9999.ebuild	19 Dec 2013 23:59:25 -0000
@@ -6,7 +6,7 @@
 
 PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
 
-inherit eutils flag-o-matic git-r3 multilib multilib-minimal \
+inherit cmake-utils eutils flag-o-matic git-r3 multilib multilib-minimal \
 	python-r1 toolchain-funcs pax-utils check-reqs
 
 DESCRIPTION="Low Level Virtual Machine"
@@ -231,6 +231,25 @@
 
 	ECONF_SOURCE=${S} \
 	econf "${conf_flags[@]}"
+
+	multilib_build_binaries && cmake_configure
+}
+
+cmake_configure() {
+	# sadly, cmake doesn't seem to have host autodetection
+	# but it's fairly easy to steal this from configured autotools
+	local targets=$(sed -n -e 's/^TARGETS_TO_BUILD=//p' Makefile.config || die)
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# just the stuff needed to get correct cmake modules
+		$(cmake-utils_use ncurses LLVM_ENABLE_TERMINFO)
+
+		-DLLVM_TARGETS_TO_BUILD="${targets// /;}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+	)
+
+	BUILD_DIR=${S%/}_cmake \
+	cmake-utils_src_configure
 }
 
 set_makeargs() {
@@ -338,6 +357,9 @@
 		dodir /usr/${CHOST}/binutils-bin/lib/bfd-plugins
 		dosym ../../../../$(get_libdir)/LLVMgold.so \
 			/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so
+
+		# install cmake modules
+		emake -C "${S%/}"_cmake/cmake/modules DESTDIR="${D}" install
 	else
 		# Preserve ABI-variant of llvm-config,
 		# then drop all the executables since LLVM doesn't like to