Make build & install simpler. Since we're calling 'install' for non-native ABIs already, we should also do a full build.

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

4 files changed, 29 insertions, 64 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 3f11f2da2846..98b38dcd46d1 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.124 2013/07/31 06:57:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.125 2013/07/31 09:29:45 mgorny Exp $
+
+  31 Jul 2013; Michał Górny <mgorny@gentoo.org> llvm-3.3-r1.ebuild,
+  llvm-9999-r1.ebuild:
+  Make build & install simpler. Since we're calling 'install' for non-native
+  ABIs already, we should also do a full build.
 
   31 Jul 2013; Michał Górny <mgorny@gentoo.org> llvm-3.3-r1.ebuild,
   llvm-9999-r1.ebuild:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index db5af04153e5..e5eee4217423 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -40,28 +40,28 @@ EBUILD llvm-2.9-r2.ebuild 6380 SHA256 e95d4d6c0fefb602a04197b10d31fff3c4ef997ff7
 EBUILD llvm-3.0-r2.ebuild 5767 SHA256 62fca1169c63516f29102a3a1bb4ea74408dfd151d97a9edbfb165a2def317c3 SHA512 f7ee2bbf8b31d86c11ab07f530278e3240ec21f3c58144a9e627aef3c1fb7690935786f33368a6f56062b5daf501adebfc164fd6712985a91076897b89cdd85f WHIRLPOOL be1a6edd697e2504df033705c2cb8e37f6c17a13d77558d231172c00f91ec247785469b6e1265e25c42eb3f6f394614cf516e0e422cb54094d9ba25669c8406c
 EBUILD llvm-3.1-r2.ebuild 6033 SHA256 9b9a587d30419fa646764a96e12fc6272f73f7246138c76ba577f0d6ab3afe59 SHA512 8b969084210af4203c029bb33d5b984e0b17f6770fd489dad818154ac9f6a87bfad069eff71776f678d9eb5d5136af472d3008d5bc73fab9dc1f36811af906c4 WHIRLPOOL 928459551d7cf6e8d18244026ba82cc3dbaf2b65bd6eac8adb617695c95535ba65bd013909730d5922de5764e9d6c6c4cf007aa6acd0b493826aa938d0389a5d
 EBUILD llvm-3.2.ebuild 6534 SHA256 5532d849a32e9f7a02f6bf6d16b01cc734132fdc9a192c46ec0e25cd8b3da7cf SHA512 bc8d3a7726a7cefc1de40e3e1be0bc06d89bdad9b3462e6ad1ef96f6d850fef3e708ebef3af20fc05a66b55f2837601ccff15b528bc088c8ceb715ed12212b25 WHIRLPOOL 5105558b2422e1d01d5aab4a52a8b434f357d481156d3885375987e9b34b001b427403407349ea82511a4230dcdfad60b08a30a20b6dc5ce4839ceb035e1163a
-EBUILD llvm-3.3-r1.ebuild 11126 SHA256 86a4eb97cdc0da7b1847fa222d6cfbdc679b4bde9545b3663a2fea846f6135a7 SHA512 3e63e636b443c9c21f3cee5bf3d40a0b175e8e00653903214c6760796ac863dfbf9036f110c5d4182932223245ed02e15d2ffb28443cdd88db58827e167ef874 WHIRLPOOL 177cf2869611f57cffcea486b25097ba8701b8ce06e778b3272d42401372489afcbac8f1963149ef74f2bd0d4b1d9a1af4f2bb0964253d1d540ed7a0bb065c4f
+EBUILD llvm-3.3-r1.ebuild 10703 SHA256 f269238c25f9f77158a59b3d6b83a5b6449520a2fc6ca09658386c97639346a0 SHA512 1bb36e6c11351c3f00478954305c99c7fd53ee918b3cd0773ac9b99defadeee3ae06dd501df1d3aa637dfb8de75ff7a211f6ea62eaa28bcbe665ea1bd5f06e56 WHIRLPOOL 8f62fa7db93e0084f0c8bb63e634e07b1b1921d5bb148a9f5bf9c2d81112498ce120d2567bd6fccb84adf829168149e6ac817c4ca14da6708e81738a6b6d84f3
 EBUILD llvm-3.3.ebuild 6798 SHA256 b8c2deecd402a9211a601cb4c9af00afe7144b9f42345b20a34a0b76a955bab1 SHA512 6b928895c8fd28e86a55e03ca82e30a127631205c5cabfeb1414eaa5079b413739a5ffa77916ab377c8693fa639b0ae254b980c5ab881beac26871124721144d WHIRLPOOL f60a7e6629d4b9a6b88e1345f61f7ffcd5a49d42185c74d12a4aadcf50369b05b62a7f700730211ca074a7d5676aa7a78cb70ae669ab05b79f112da15f7e194c
-EBUILD llvm-9999-r1.ebuild 10172 SHA256 4b757f3314f0772ec73b2aa971d5e1925c28df8504a033e789b4d761cb536546 SHA512 081b1dc3a48aa6c88b6275c5afb33e19edf7c1a9bd59b90ef302c22ed4764922c2494d270a070ac2451bd856d1c8af0317181bd1cf9886d3c7c06d18346f9748 WHIRLPOOL 6c9b5d4c06f1d8a9d9e4361840df4a55a4616ab84537dd41c6e000af99bb85f8d2554b9428e333d8628ffceb2134ac27c8d28c2cf820fd3bbec4546f27f840a7
+EBUILD llvm-9999-r1.ebuild 9749 SHA256 569172876e10ba516e5cab2685a3291874b9b01d4df0a75ce103f48967cb9ac5 SHA512 ed286f7a48572454d16bd8eeb3d172dbc62f424b9e78ac9061c100024076dbe6a0794fefb2167737d15e942651dfe84bd0a6ca93c271f1989680eb148b3265f6 WHIRLPOOL 819358ebee7ba2d1b8d315ca256901eca1661490fb17b0f707f1f76590bad77df710321e220852cb522e609946c96b7a762df51e48bc51486f7ca1192c515714
 EBUILD llvm-9999.ebuild 6460 SHA256 3e791fb81ae80f89f1ae07d16a4c4b7e8a609d7bdedfb210156c86ed3217ccea SHA512 95de19c7fcf99c14b6a57bc8b034ee5b7b0272fe7e1513fd42b8ac4ba234a1704967f2692ffbc26ad7d5390a4274889747ba9d4f5a441a346f7339b7a1ee57ba WHIRLPOOL 7d213935c4c4ec0a9e8a8a6dda1092c3feb802e2f4b62b76b37149e77efb27dca2a6011070a8fafbec3be6c354e0865d1850203384937cb1ecf35c5ce92068fd
-MISC ChangeLog 21040 SHA256 f7d72fd88da10827de8f4b81aac7e2a3eadf60456dd724c5483b3a665b36f281 SHA512 cd600fe906d91358477d92fc50f28e8286f230913db64747dfbfffa4986f153064e2b929c9b3fa3db01558688a5e0b56fca521a24daebd7a2cb69cedb8434e5b WHIRLPOOL a3471e0918cd7abfabde28aceb994395883235d66e7a813187f1cc986a0eeb863c67af9a5da69bbfd139bef3c43144f98a781f1990132657286ffb90ab691cd2
+MISC ChangeLog 21259 SHA256 432e01b8a458d719cd2974961bf46deb0ea1afddaae0e31ca82f2eac6357b92d SHA512 4cc45944e93161a1ec5f774eab629d0c15a35a0268923734c332972e838beaa9f7f0a362242493c488179c9e982987aacc8935ca8171fcef99eceab9a64a5628 WHIRLPOOL 84aabb087f0f4fe878102999f38732892333b17abf0e2fabac23f9625f04c5e7d3e1cb1170110699c120a3b116bd85f7fb725363fad291612580038ceabf65b4
 MISC metadata.xml 2632 SHA256 2600c9022e42659f3c9201ecc0387455d2b76d70225ba4c9be8420c55fa6ab07 SHA512 43702a59d30b6bbc57d7f33497b3889d3dddf228776e8a79946ca868269451e6fa5666f561ae99fe035851bb305c6e9d3eb5de5955f1cc84bd62d557ad4ec314 WHIRLPOOL 143e68e5f52836d6bc6de79e7c055d7f776e49b17d563bb71e84f37b16f207e0cede39ee6c4b29bc566fc1b102ecd16743e596509fdcf239ffb8bced13b15ac2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJR+LVqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJR+NklXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD5okQALe4vQduAhQIBU9SMt64se2g
-glMt/ep55KjwE+rSrRX/My0MVAQ2f4OnM4tmxJQS3b93+X1c6pq4Eh9AfMjkvvKI
-TVt7spA5qCqvkz+guWpUPk/N+HV2TqZOYvL6v4gVoPxeem3kB+zHwffmiClcEdAb
-C4+tem8HkNlOJ5xhL02nJ5CCxKGLRR6RxLQho3MTQ0dCwyv+NHRNREzdQyDaDxpk
-YmzTep6cVCd9325biMbhVhoLj8ieqx/SgYH5eKDBmLX+RXZxcIwAba15ndZPWiNm
-h3y6WxSe93j12C0DZoN89fv50lvP6i+2lSHgkvCfzJX65Ora4f37GarMhTBvPfO9
-TyclfaJtKI9J+gnJP1LGKBG48te1vS6eGShaG4m+uY4VbpYDKyLIFcGpaG+lz6Gk
-p+oToYhea7MEKXukPIo/T/0kt6PgvU4io7A56qvW/v/1F/xeGOxFjuR11jZMo/TP
-xlx1CB8wnUoZYZZ7sIvzXuR40sWElM7THLWbwfoJPOT5f4lJnWycyiYkRQHlBTTL
-e8mGmHT85hfbXByKd+a03mjYtm2m249+tdCx4fU+9vaneQpkXg5hKv1RJkVLoi5F
-I65VTTDlDmMNNCYzwO8ZB0Iyovc6kRIvmWPxm2Gtj4mHsl47qATcurvOVkyvKrSI
-S8ve6zYBOFBcKvC07tO5
-=xTHC
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD/w0P/2k2Zc4iqBR+a+nyhoDFytyo
+QDAEcZM4mF87hkbTvYfSBWOUhyK35CWUhMAKgfW0khjjn3YG7CRI3VoyHISzH8TH
+t0v48zTBnbYxL3Jq9GW3x0GDQMvO/XmIXhX1UF5jnKuwH9fg35zBo3mzLplx2yM8
+mEsDKCtTYhP8f79i/dnKtcdTVTKCg0YPkQr9NKmKXVYBX439G4QfuY5K3MDLuzXn
+wKzTqF5mVor9D4BVOmZQh6EFN0j+knyWQj64qwu5msLixY/f5Gvlvq6r9Thc3RRt
+28LGWUbXwBQqCWAja1lAtsgpirlUEboI7i6/jlMhVg23+pnuiZCOrFkvXU72+BlY
+vUYcbMb+RNFK77xXtJ4CogQRUHaR2Haskc7zTyG/LtyPrF9Q6N3gnDJTVPXFU8Ja
+u7rDYpzSko20O42vuJgh6E/MZfjlLqxP/0Fq/MCkj/hzy3USeCyP9ktr3Wzg7uPE
+9xUEjYOHqXx+SU8zG3WuwjxGY13cZ4oOmRPvihry0FUbX0MDBl5Kui21P/tJPaDY
+09HI2ZjqgPVFJTj8nuiC7aWsSmIilotnHN8Ji+XEzsb/gusK9P328h8KzSm8hAXf
+kLAIdghaa41X6vxtvFOtSf0Y9V+P6DsshqOxiiccmVRN06mAYrQwZlZ+jrA6qI0Q
+FnPrfDqugNv8LhqmRdvI
+=2s1M
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-3.3-r1.ebuild b/sys-devel/llvm/llvm-3.3-r1.ebuild
index 25fdfdff4c8f..ea454b84b0c7 100644
--- a/sys-devel/llvm/llvm-3.3-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.3-r1.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-3.3-r1.ebuild,v 1.5 2013/07/31 06:57:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v 1.6 2013/07/31 09:29:45 mgorny Exp $
 
 EAPI=5
 
@@ -211,22 +211,7 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	local mymakeopts=(
-		VERBOSE=1
-		REQUIRES_RTTI=1
-		GENTOO_LIBDIR="$(get_libdir)"
-	)
-
-	# Tests need all the LLVM built.
-	if multilib_is_native_abi || use test; then
-		emake "${mymakeopts[@]}"
-	else
-		# we need to build libs for llvm, then whole clang,
-		# since libs-only omits clang dir
-		# and clang fails to sub-compile with libs-only.
-		emake "${mymakeopts[@]}" libs-only
-		use clang && emake -C tools/clang "${mymakeopts[@]}"
-	fi
+	emake VERBOSE=1 REQUIRES_RTTI=1 GENTOO_LIBDIR=$(get_libdir)
 
 	if multilib_is_native_abi && use doc; then
 		emake -C "${S}"/docs -f Makefile.sphinx man html
@@ -269,12 +254,7 @@ src_install() {
 }
 
 multilib_src_install() {
-	local mymakeopts=(
-		DESTDIR="${D}"
-		GENTOO_LIBDIR="$(get_libdir)"
-	)
-
-	emake "${mymakeopts[@]}" install
+	emake DESTDIR="${D}" GENTOO_LIBDIR=$(get_libdir) install
 
 	# Fix rpaths.
 	chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \
diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index 01d5c6cba4fe..61d240408e2a 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.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-r1.ebuild,v 1.6 2013/07/31 06:57:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999-r1.ebuild,v 1.7 2013/07/31 09:29:45 mgorny Exp $
 
 EAPI=5
 
@@ -191,22 +191,7 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	local mymakeopts=(
-		VERBOSE=1
-		REQUIRES_RTTI=1
-		GENTOO_LIBDIR="$(get_libdir)"
-	)
-
-	# Tests need all the LLVM built.
-	if multilib_is_native_abi || use test; then
-		emake "${mymakeopts[@]}"
-	else
-		# we need to build libs for llvm, then whole clang,
-		# since libs-only omits clang dir
-		# and clang fails to sub-compile with libs-only.
-		emake "${mymakeopts[@]}" libs-only
-		use clang && emake -C tools/clang "${mymakeopts[@]}"
-	fi
+	emake VERBOSE=1 REQUIRES_RTTI=1 GENTOO_LIBDIR=$(get_libdir)
 
 	if multilib_is_native_abi; then
 		emake -C "${S}"/docs -f Makefile.sphinx man
@@ -247,12 +232,7 @@ src_install() {
 }
 
 multilib_src_install() {
-	local mymakeopts=(
-		DESTDIR="${D}"
-		GENTOO_LIBDIR="$(get_libdir)"
-	)
-
-	emake "${mymakeopts[@]}" install
+	emake DESTDIR="${D}" GENTOO_LIBDIR=$(get_libdir) install
 
 	# Fix rpaths.
 	chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \