Fix gcc version check. Add missing libxml2 dependency (for clang). Install CMake modules.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 61 insertions, 27 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 091ef0053285..cac0c4373046 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.152 2013/12/19 19:08:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.153 2013/12/20 10:53:47 mgorny Exp $
+
+  20 Dec 2013; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
+  Fix gcc version check. Add missing libxml2 dependency (for clang). Install
+  CMake modules.
 
   19 Dec 2013; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
   Symlink the LLVM gold plugin to bfd-plugins directory to enable LLVM object
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 3833992f7714..7c25f5b2406b 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -45,25 +45,25 @@ EBUILD llvm-3.1-r2.ebuild 6033 SHA256 9b9a587d30419fa646764a96e12fc6272f73f72461
 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
-MISC ChangeLog 25641 SHA256 fe380faa857882fece0df873884d209b9cd610925ca5a8eff99d777fca05465b SHA512 ef79e5b53db0d1ff9a9d07e8806364cceeb7f9ada6bcc286c426bc218baf3cd709213b07c0e96769b4abb9abd3f53bf8268653755dd21fd2c524062e60baf41d WHIRLPOOL e24284e9685d5868f5b987dc32337a377abd5cb195d0a638a6ec0d89da82118f968cbfae10335329d06a71e889131e8d01c099e3dbaff82c3df5fb9b545d97a7
+EBUILD llvm-9999.ebuild 12807 SHA256 b9611bd472b40809fc7863e6e15207af1745ab7901568f5646982eded0cdf3de SHA512 5ab516ceff13a978dbd751216cbc77350ed31c9b06817331a14de0693ca84694ec3a045b87102b925ccac9f1aa5614668c7906ff3a4e9bdcd49b7e515615199c WHIRLPOOL 9d5f214674a477f79a62537b29548c801d4af6605a4f624958802285945aed2bc837e4133b82f288c89975b7375a5e1b6d97a1a7aa8b095bcb70cd6129f1d9e5
+MISC ChangeLog 25804 SHA256 c253937d9eee8bebce0f7362825bbdd898fc42f65a3fc6bd70d4c1c1cc2ca61d SHA512 5a8a78c1ac20b01116018ac4d9b5e64495e92d156040c4724635cbca6a01e09727e1b203c4ede8e0d588830a4bad8485ca1b2a10461218ece8ed6d3a36cb0966 WHIRLPOOL 6a9a557c91104e4d8d465b637e194c0509f4738f6a4e3db909711f7ee8b4c41eea05426eb7a31106a952b640360a1c397acdce5d1b527fab77a63f4d45e70e11
 MISC metadata.xml 2723 SHA256 d1bbe72da2553592ad60522f744b8339bce17487343abf372d966c1fe9cd163d SHA512 800f72039a5f0fdb175a8ddab7ae8f184907865802ffd5f139006f3a8c77053f114e2f7b01cef3f41f6fffb3f8f8b2b474fdf95461f27b2dc8ae31cbd732a14e WHIRLPOOL 462d3d2f22e29d3678621a9f89ed98a58ee60fde57da7be21fbca7fd61e106abbcb19c0e491424869302c19ca93b15c480cd7ca2a3181f2148174d44e891e190
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSs0QuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJStCHDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 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
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOA0oQAMPUB/h4NCMeT9XVl72p0KlE
+NfAnKH+7Hu/RCqoooVWqDxITda6JgLnGn6xnA+udOgaqMz8yXhmKuWtFdit7pD2v
+KuHPqaDpXifLBGiotC55Qef2zXtnEh3CMWe0n2Vpir+vaKq/i4mcWrA3LPjsy/Wk
+ODOQaUaoUAmCQxMNzWl2UUtQr0dqHLjFaIxx/4JMf6Z7R1E+0U7cMX0D7zM6WLGx
+tPMNQjTZzgCC91hDzoG72QX0MOWnPVPVaRxV8GTBHyG8t/e+MaZ2B17/fAZ2X1By
+0g4VcNNTL0tDg03yomeu/io7GRYilHzbP3W18cx+2eQ/vSyCMlrSDkSkjuOZhI2W
+nPydisidcxTaFKVLEOJmSbj1Omgf9LfkGeUDsKJdaxP7Whm+MebUavgnrgzNJ+pl
+qqn35wH8MG4TLE4Yva8BPzzzKDmIRO7jep2yGEVKbs0JPNGIKcgLUJhrZAZs4ksv
+EAuQNyicNjxSQiJ9YJF6qVIQUdRjun2b76oCYdUvSRCtjKod1cfYdkVbGnr74+vg
+dmp4zaPxuZ+a2pqH2srde/QsIHz9ETm/K5bXsNQQrtwMjKtisEw/GwcWNj6kylKe
+2oMmID1BFlgazKrjsngvnlbnSgzHf58oJmxFSX09sFwwdVjN9Cb8z39Lg9xQrBbI
+hTS9NNj9sMaaOl72zrDc
+=/sMv
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 9e177f06b738..10ef3a12a0a0 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.66 2013/12/19 19:08:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.67 2013/12/20 10:53:46 mgorny Exp $
 
 EAPI=5
 
 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"
@@ -19,7 +19,9 @@ LICENSE="UoI-NCSA"
 SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="clang debug doc gold +libffi multitarget ncurses ocaml python
-	+static-analyzer test udis86 video_cards_radeon kernel_Darwin"
+	+static-analyzer test udis86 xml video_cards_radeon kernel_Darwin"
+
+# TODO: update libxml2 to multilib, bug #480404
 
 COMMON_DEPEND="
 	sys-libs/zlib:0=
@@ -29,6 +31,7 @@ COMMON_DEPEND="
 			dev-lang/perl
 			${PYTHON_DEPS}
 		)
+		xml? ( dev-libs/libxml2:2= )
 	)
 	gold? ( >=sys-devel/binutils-2.22[cxx] )
 	libffi? ( virtual/libffi:0=[${MULTILIB_USEDEP}] )
@@ -99,20 +102,20 @@ pkg_setup() {
 
 	# need to check if the active compiler is ok
 
-	broken_gcc=" 3.2.2 3.2.3 3.3.2 4.1.1 "
-	broken_gcc_x86=" 3.4.0 3.4.2 "
-	broken_gcc_amd64=" 3.4.6 "
+	broken_gcc=( 3.2.2 3.2.3 3.3.2 4.1.1 )
+	broken_gcc_x86=( 3.4.0 3.4.2 )
+	broken_gcc_amd64=( 3.4.6 )
 
 	gcc_vers=$(gcc-fullversion)
 
-	if [[ ${broken_gcc} == *" ${version} "* ]] ; then
+	if has "${gcc_vers}" "${broken_gcc[@]}"; then
 		elog "Your version of gcc is known to miscompile llvm."
 		elog "Check http://www.llvm.org/docs/GettingStarted.html for"
 		elog "possible solutions."
 		die "Your currently active version of gcc is known to miscompile llvm"
 	fi
 
-	if [[ ${CHOST} == i*86-* && ${broken_gcc_x86} == *" ${version} "* ]] ; then
+	if use abi_x86_32 && has "${gcc_vers}" "${broken_gcc_x86[@]}"; then
 		elog "Your version of gcc is known to miscompile llvm on x86"
 		elog "architectures.  Check"
 		elog "http://www.llvm.org/docs/GettingStarted.html for possible"
@@ -120,8 +123,7 @@ pkg_setup() {
 		die "Your currently active version of gcc is known to miscompile llvm"
 	fi
 
-	if [[ ${CHOST} == x86_64-* && ${broken_gcc_amd64} == *" ${version} "* ]];
-	then
+	if use abi_x86_64 && has "${gcc_vers}" "${broken_gcc_amd64[@]}"; then
 		elog "Your version of gcc is known to miscompile llvm in amd64"
 		elog "architectures.  Check"
 		elog "http://www.llvm.org/docs/GettingStarted.html for possible"
@@ -195,6 +197,12 @@ multilib_src_configure() {
 	if use clang; then
 		conf_flags+=( --with-clang-resource-dir=../lib/clang/3.5 )
 	fi
+	# well, it's used only by clang but easier to pass unconditionally
+	if use xml; then
+		conf_flags+=( XML2CONFIG="$(tc-getPKG_CONFIG) libxml-2.0" )
+	else
+		conf_flags+=( ac_cv_prog_XML2CONFIG="" )
+	fi
 
 	local targets bindings
 	if use multitarget; then
@@ -231,6 +239,25 @@ multilib_src_configure() {
 
 	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 +365,9 @@ multilib_src_install() {
 		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