Clean up the build procedure a bit. Pass the same MAKEOPTS to all calls, and therefore make tests verbose as well. Avoid building unnecessary tools for non-native ABIs.

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

3 files changed, 79 insertions, 41 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 5d4917afd390..37964dc4deae 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.148 2013/12/03 14:02:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.149 2013/12/19 11:08:15 mgorny Exp $
+
+  19 Dec 2013; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
+  Clean up the build procedure a bit. Pass the same MAKEOPTS to all calls, and
+  therefore make tests verbose as well. Avoid building unnecessary tools for
+  non-native ABIs.
 
   03 Dec 2013; Michał Górny <mgorny@gentoo.org>
   +files/clang-3.5-gentoo-install.patch, llvm-9999.ebuild:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 7bcb0248e2b3..d2516f306c70 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 10594 SHA256 fe0b8ef3378d6d36a1c2f3d1e213102c0eb2161bcdda9363e1ad9ebe018a6336 SHA512 2a9a86f58c88fea3dda5b649a52226a49a13508966d72cbd3d4d988c13dc7220be1c8b258186fb13e109b77cad72359078db04411415a7b0367d2f46e553daa6 WHIRLPOOL dfd648c761a94329d58b31293a47f980f0f5149e965263fe33c26851409c643dc69789b3c90ba501d30e3cea2dd51508f09017bcbbff8171a6673ffec557758f
-MISC ChangeLog 24849 SHA256 a077079e4493a53fdf04291d6396e80f3b8b01989024103a902c40d53513b2fd SHA512 bea55e2784055f565c0979b50d244518d60bfca7d2aeea3800055c799211ed89481d0642cdd5338f60469416a1374db1441be9a71d15a42e62deaaddf077340a WHIRLPOOL 702efdb032692b55738388837787d74c43cda6fd1cf369a0d924c482c2c77f69610d4cf1a2cc6451f3692241ee753d7d61d3d6702bc92a1aa85f2c35e2e13e85
+EBUILD llvm-9999.ebuild 11152 SHA256 8cfe94b5da8507769087b5bb07fbb5c4282ecffb3d02485b1d82452a99277d04 SHA512 3be515add98e35afd2ca7b14de7913b9d2dd7f9a07408e96d8ccbfbf015df0fcdf564860755faedaf4941acaa1771f2001239aab1aaf7ff62fae498d3ca2eb15 WHIRLPOOL 8e47e1e32ec8de8ef15734c7f059836102275cb50811013ad4513fc779ce0f5a72f62f4c601ce6633612158c2a63f0c4031a17acae3d404d202c3190d2a3398d
+MISC ChangeLog 25093 SHA256 549d2d8903531ff07f11ce106a015cb9c2abcb4a098836ec2be6462d4ff3755e SHA512 2f972899f942887365d7fe0925ea088e9ff420117b3a625309bb89ff3ef694ae8027b43325279d06ef4b3e46fbe2d62fd52d25659b234a017c86e81c2aadffea WHIRLPOOL f298b6b5a092ba78516255df21a54adfe7c235b5d8af3aef460eb1dbce4c12eec96c286e82c4f668df7a3924022c5bf6e1d50dde77fb42dd07fd8fea753ba9c8
 MISC metadata.xml 2723 SHA256 d1bbe72da2553592ad60522f744b8339bce17487343abf372d966c1fe9cd163d SHA512 800f72039a5f0fdb175a8ddab7ae8f184907865802ffd5f139006f3a8c77053f114e2f7b01cef3f41f6fffb3f8f8b2b474fdf95461f27b2dc8ae31cbd732a14e WHIRLPOOL 462d3d2f22e29d3678621a9f89ed98a58ee60fde57da7be21fbca7fd61e106abbcb19c0e491424869302c19ca93b15c480cd7ca2a3181f2148174d44e891e190
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSneSEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSstOhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZORZEP/36N4uMDA/XTPgpC0RggR0e9
-KHjQSgNOhdI7WnIg2VMixC1oQPqgTMiCT00Fsvvz+78hBWl9A/1YWqdpbtKuz3Oc
-LQwi0UnBFCqHqsuLoTN9UI7K8GHgC7lpH7fzp0+Ay3KegogPwdMhnCnMkUKER1TF
-aMEbeoVW9cQjv18Yg7/oF5vCm37yP++xFLhJCa+jtf/iQt8WbXna3j3BOSSDsarp
-nLjR+G72R6C6dv6a8LMDQABqyYNiwcFarSuHbkfuheIrjszAcCsT8GanszOr3EFy
-UEPoKB3ZdfYAmobh1OyPu4HHX/EqYkG5zVLgD0a3+rs06QLgQDn3VDJhqHqpgh8Z
-D/0d9DemeMCiQValShV5xxbKSj5sJGMjLOMy+NfRH86R2gE6O/aC/NNasLLTVLTN
-CVYvg8CTteVcTSMHM3csOiYmZQkI8W3Z1tp8nO5jXG8ZLBbzq5XFv9yMBRRByPs4
-ip02dG40dBT7OVL/0dcBN715NryG6apYl9QXsJp8a6J5BMCGO5pWOgWefAwcsBpz
-Iw+rPUcBDibWUwO35nkwsJSMPAWk3+Z+AY4zEBW0v2JYsj9SGejtJTwbR/Sce7P5
-yQpN/JU2dGDxXW0SBm2Yy+YM3tHUNoTsirZjkGDo39184pmNeEzc9BYu6dPGd08t
-cMquWURja0I8sn63k+cu
-=gcx6
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOOncP/RY/1uiD/I3UqO/zfqi1zh5B
+z1WU1RBXfafVRaX8gRJM5V4I5ogv9pM7G1De/ZzW8sANrPLQmFIWtd8h+3LmwXE/
+TyMdqKHAvZJrWChtX0QRG3eSxlBUBKpM1T8U1ERW5+TmGY5yhBiv59t/NjUhebbr
+u6qKxqfn36cODf2cr4h2C8mPhbkFG+AzYHqat7fokemzl/rhos+Lf3dTzg9HuAfL
+BLXHLDT99CMQiuUacwYXdILJxoP3/uEJ69epVYFaQS8XZmSOrauOxEcut+d1/6M0
+F1V7Mz0qh3PuBEsAiE78OWC91jSiRM4iQP8aQEJskB7GvSqlVpujjPZLthmAwtj3
+lnqwM+NwCPZ/X8Pyf+hG+Jwm1d/SHxzWYGuZJq3PtygwrmQ+YrJpq1EbBWtGdeS7
+TyOLwX8dPoJgQD+MfXPnZFNQMnu91/vGkYMVC7V+wzKWqKGt/OPoIUdCmil0dAMQ
+NhDwLdifedCB62DSieKBaeZLGKJpL3sh8y8eSBYWHBzZ+PjfOEN3WIEo0C6EziBY
+rxBYNJEYvqOJeAz5EZWrG1tyyuX9XfiwchTy9hlip2aH5eYUn55wmiRd3hEaYNKb
+psFwV3LSPP4mQo7pkmisUsxPhZdEMA3/Oj5QoD0lutDqqN6yTI/JTknGxYPw+laL
+qjz/okKuTa3mOFuzJFdL
+=BbW1
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 241ffe1b6096..2e0f941ed81f 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.62 2013/12/03 14:02:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.63 2013/12/19 11:08:15 mgorny Exp $
 
 EAPI=5
 
@@ -180,7 +180,8 @@ src_prepare() {
 
 multilib_src_configure() {
 	# disable timestamps since they confuse ccache
-	local CONF_FLAGS="--disable-timestamps
+	local conf_flags=(
+		--disable-timestamps
 		--enable-keep-symbols
 		--enable-shared
 		--with-optimize-option=
@@ -188,33 +189,33 @@ multilib_src_configure() {
 		$(use_enable debug assertions)
 		$(use_enable debug expensive-checks)
 		$(use_enable ncurses terminfo)
-		$(use_enable libffi)"
+		$(use_enable libffi)
+	)
 
 	if use clang; then
-		CONF_FLAGS+="
-			--with-clang-resource-dir=../lib/clang/3.5"
+		conf_flags+=( --with-clang-resource-dir=../lib/clang/3.5 )
 	fi
 
+	local targets bindings
 	if use multitarget; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
+		targets='all'
 	else
-		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host,cpp"
-		if use video_cards_radeon; then
-			CONF_FLAGS="${CONF_FLAGS},r600"
-		fi
+		targets='host,cpp'
+		use video_cards_radeon && targets+=',r600'
 	fi
+	conf_flags+=( --enable-targets=${targets} )
 
-	if multilib_build_binaries && use gold; then
-		CONF_FLAGS="${CONF_FLAGS} --with-binutils-include=${EPREFIX}/usr/include/"
-	fi
-	if multilib_is_native_abi && use ocaml; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml"
-	else
-		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=none"
+	if multilib_build_binaries; then
+		use gold && conf_flags+=( --with-binutils-include="${EPREFIX}"/usr/include/ )
+		# extra commas don't hurt
+		use ocaml && bindings+=',ocaml'
 	fi
 
+	[[ ${bindings} ]] || bindings='none'
+	conf_flags+=( --enable-bindings=${bindings} )
+
 	if use udis86; then
-		CONF_FLAGS="${CONF_FLAGS} --with-udis86"
+		conf_flags+=( --with-udis86 )
 	fi
 
 	if use libffi; then
@@ -229,13 +230,39 @@ multilib_src_configure() {
 	tc-export CC CXX
 
 	ECONF_SOURCE=${S} \
-	econf ${CONF_FLAGS}
+	econf "${conf_flags[@]}"
+}
+
+set_makeargs() {
+	MAKEARGS=(
+		VERBOSE=1
+		REQUIRES_RTTI=1
+		GENTOO_LIBDIR=$(get_libdir)
+	)
+
+	if ! multilib_build_binaries; then
+		local tools=( llvm-config )
+		use clang && tools+=( clang )
+		use test && tools+=(
+			llc llvm-objdump llvm-readobj llvm-dwarfdump llvm-rtdyld llvm-cov
+			yaml2obj obj2yaml opt llvm-mcmarkup bugpoint llvm-c-test bugpoint-passes
+			llvm-as llvm-dis llvm-nm llvm-bcanalyzer llvm-mc macho-dump llvm-ar
+			llvm-extract lli llvm-link llvm-lto
+		)
+
+		MAKEARGS+=(
+			ONLY_TOOLS="${tools[*]}"
+		)
+	fi
 }
 
 multilib_src_compile() {
-	emake VERBOSE=1 REQUIRES_RTTI=1 GENTOO_LIBDIR=$(get_libdir)
+	local MAKEARGS
+	set_makeargs
 
-	if multilib_is_native_abi; then
+	emake "${MAKEARGS[@]}"
+
+	if multilib_build_binaries; then
 		emake -C "${S}"/docs -f Makefile.sphinx man
 		use doc && emake -C "${S}"/docs -f Makefile.sphinx html
 	fi
@@ -255,9 +282,12 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	default
+	local MAKEARGS
+	set_makeargs
 
-	use clang && emake -C tools/clang test
+	emake "${MAKEARGS[@]}" check
+
+	use clang && emake "${MAKEARGS[@]}" -C tools/clang test
 }
 
 src_install() {
@@ -274,7 +304,10 @@ src_install() {
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" GENTOO_LIBDIR=$(get_libdir) install
+	local MAKEARGS
+	set_makeargs
+
+	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
 
 	if multilib_build_binaries; then
 		# Move files back.