Clean up toolchain/cross-compiling logic.

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 45 insertions, 38 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 2cc171c68b90..c46baf71a049 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,21 +1,9 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.212 2013/01/21 16:27:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.213 2013/01/28 04:37:36 vapier Exp $
 
   21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> nspr-4.9.4.ebuild:
-  Stable for sparc, wrt bug #450940
-
-  21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> nspr-4.9.4.ebuild:
-  Stable for ppc, wrt bug #450940
-
-  21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> nspr-4.9.4.ebuild:
-  Stable for ppc64, wrt bug #450940
-
-  20 Jan 2013; Agostino Sarubbo <ago@gentoo.org> nspr-4.9.4.ebuild:
-  Stable for x86, wrt bug #450940
-
-  20 Jan 2013; Agostino Sarubbo <ago@gentoo.org> nspr-4.9.4.ebuild:
-  Stable for amd64, wrt bug #450940
+  Stable for sparc/ppc/ppc64/x86/amd64, wrt bug #450940
 
   16 Jan 2013; Lars Wendler <polynomial-c@gentoo.org> nspr-4.9.1.ebuild,
   nspr-4.9.2.ebuild, nspr-4.9.2-r1.ebuild, nspr-4.9.4.ebuild:
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 338825142a7a..37e2e2c566df 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX nspr-4.6.1-config-1.patch 565 SHA256 9ed8fd15102ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6 SHA512 3556cff96d3e773d6e1762d94b9c325207578e4e910d33464c26b2084f42f2162c5fbb12d8f2206dbe4c5a7ecb1c8c63a699f08bd1b31c5b71eb73d257c46be6 WHIRLPOOL 7c249f1465f65da765b37b256d9cd8c8cef7d5fc7cb8a57f40f29a98cb2247cc3e1ec002f106d50bc531cfc6a8c9de5a85d6f522ad5b8f6e956fc0790d5993b4
 AUX nspr-4.6.1-config.patch 2722 SHA256 01bba00a314375cbb056c4e26e059515a6a0df92c62229799abca9f3fa9c7842 SHA512 2c8d0fa5c1bf1b79883fabeb09870e253073fe001fa7fc63c8a2f44a4ec20bc235d4be40c2d1fa247fa93a0d642233a7dee5b4734451cee46b7c1df2a1dd09d1 WHIRLPOOL 31b00c6674b72c705f43f1c41f887448dad880947a63bfd0abe8dc8853a0322e238012c6d2708b5840f35016f1ef812d62bf5e370b84239f86c1b7109947d58d
 AUX nspr-4.6.1-lang.patch 1718 SHA256 326f5f9d020e73a6ed8e949124eb075f21d856d0b099b8d04035ecc937cd35fb SHA512 ee23a7fffb36e8ea10fe029dcd2fa374eb397fb038c628d9140f20c9a6267dd2ee4f76fb02ec79698fae4a1493fe58b7b4f28795afd54cb868ef6fce276cf291 WHIRLPOOL 56ad48b4d75cc624382a60d783e36dfaf2c6fc5195f300710a35fa7a058ea4b0f5904e7d6de361e5f340116531c824cd86175dc80e52efbc04f5ded92e592ce9
@@ -24,7 +27,24 @@ EBUILD nspr-4.8.9.ebuild 3784 SHA256 888de34db739f48ca4368827b97f91932efb81de781
 EBUILD nspr-4.9.1.ebuild 3653 SHA256 b1d909af59039b012f7a09485385d0639a00d80fdf30d2e1020c4f7c82dfcf2f SHA512 6f1a558975bcf64488d86f43d36c5b15599775e37241f60860d70c6b9a0f432a4175f5ced9ffb4a60696bf09047f266ce196b9fd41e2627259b2126fca00f55b WHIRLPOOL 8168aebb7daf2724cfdd35322fe817e25fe4039abe3c1030123d2c53faa004f7e78a877881b758b86263ab27494cd096a08f41dbb4978d42aaa25c76654501e4
 EBUILD nspr-4.9.2-r1.ebuild 3760 SHA256 2086bb41ae781d78f379422db45ce4c6ac55648cf4f26388a6dd757b4125ade3 SHA512 eb7d650eaf43eb90a4c2a2ae2eee9263b5b54d585771d6b4cf5adcb2802f658d92c9525932eecba3b99319511ce6570a8625543f11ad8daaa81f86bd367381c7 WHIRLPOOL 52cb084893d175933aea2d240e0d2a888fd4117909357e04c5c4971fe83a1d1c16f43203a7289e0a5723111821b6ec9704d2d3584204e12a01ff42cdde7501f6
 EBUILD nspr-4.9.2.ebuild 3656 SHA256 21e578c935decb6a905d31e081bb7c3a1c520efe9b6436c3fb35cbf572827964 SHA512 5239547b08317f41741011d6ecbf64f381abc6fccf32073464dbaf03201925ca2b6ec1ec1ad2ffcb9f96a4e3a91e435b8cb322a93dd3c137b845629c8d78ceca WHIRLPOOL 4581834ce55ff0c7e8f980b71fa09ba63c2e956b1b55c2666e0d40a56c42f0f3ebacdb199c749939da64c0600e95d2cca8d70c180f1889163337e0ed7c02c788
-EBUILD nspr-4.9.4.ebuild 3862 SHA256 ad0866209bd34fbf371688f3c581a8655b84d71f2c0eee65affc1f0ba1afc79d SHA512 7071220da896e8fc9270d1c87c16e189d889a24b307f74230e5ae6691a7a956b5f5fa84057ffff678706bb3b5abc3857487aa43c6f31aaaee46709cc8aa60c57 WHIRLPOOL 91046d3d4287c371e47372f7395dad86dda1e616c24aec66dbeacd98f590b298c57018c157deb9580874e9da44212ab8fe85aad119f8c6d3b34da6b06772ea70
+EBUILD nspr-4.9.4.ebuild 3636 SHA256 bfd8ea7833e739985a18c59614b3e3c421f13c60c00d8fa9072c97937a814bc8 SHA512 706eb3f2c1ab8f9d8591560716dfcf330ef84a672de8cd34927f8f59c9cfc815288e5e87aef501f09feea8da1d8b93d0d56e7cddf8461bbce39ba8346b8f37d8 WHIRLPOOL fed509456768136be70b8860cdd4d28359b180f35184d2a250105fb507930b77bcd84e6b5f09ff89d1b406e4ed28d23bb440777447ce3c1dacfd0da8e48a22f7
 EBUILD nspr-4.9.ebuild 3702 SHA256 70d3843e5d588eab366a77e35d5205f94decf60493f9670c0fe7ff3940b0c204 SHA512 f3a8b66281183b57278a44f8841dbc68fb3ef7ea45a56dfb46c142219d016641c1accd805b0d790136a96b51223c1a00a08738e77b291893ec050e0e1c18d99e WHIRLPOOL 8762e5b0cf414b64daa81c472daf4841e6209c946f2a1d3dadd1a8150449563b0293e9ba9613fb2d2878fcfdac3e3b7b04a0e9defb0db40f4b27257e1c79fc4f
-MISC ChangeLog 27466 SHA256 301c3cbba5b59d6ff5a7beb7d949d745e9ffd7ec1745e675fd15a521eb030477 SHA512 52d1a9d8879785e5ed6ba5d14cfa9543e6955b7bcf21d262d3d94f0d48c7fcbf37ee0af9acc7e579c6d7378c5b72dd96dab78a9d280dcbb87e616c6bf6b8bc76 WHIRLPOOL 4a08c9a730583c895e2bac802ebd68df05744a718d2580e06e13504255dbd24fb5a2a3699439f14bd36ad6c1c19a7454d45974034bfe7689355be132e8523fba
+MISC ChangeLog 27073 SHA256 85b7de1e1143ebf6acf90e5821ae0da8a20d7a7eebb3fb25a4d7b6de92bbfc16 SHA512 79a9042ecc4d5862d5f81859e5f17f4de1fe270fc5a8df31dfed8243c20c03b0f88a45ad939c527ec8f7a62acaa6b2727c2731f61d6aae2d4782a34a544c97d1 WHIRLPOOL c5a9f8741a8cbf60874373dbbfdd3a3a6d56328ced8a31c2eab2f613ea16df6ef249c773db49989f05f7af5fad6ae89d5bb6349a24f84409b6e3ee78d6013aa2
 MISC metadata.xml 160 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b SHA512 ed6f709d55351c1b69f2b43ada124fcc2f8969f8c3867073bb0c68aa502f16247cbcd78734a891e4d1a509d334f6805e5267d2088cd03f3408a636ad9aedc2bb WHIRLPOOL e6bf1791838158287debcc3160dd075dcdf88bc1b33060aefe4687b4451108e55b6f8021fc36f07ab85c4e37a4225444cc2804cf40bd61ba49726bbf12fa4e38
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRBgCeAAoJELEHsLL7fEFWFBcQAK+s7rPjextygWOoUj4fh+N2
+WDJYptCWDyHURJxfcse+d8A30cKyLfFKQ03IEaS80bKGXRG89DNLVZXfTEBWhC+C
+Cp9LgSJ6P2FBDpb6O1N3rTBoDKiTurOhEDCCBXmS16duDLoDIH39lhWmqK9PeYxk
+K224qWQPfdK9CCWXjlSHzEixMXLkrkdCPGeWzTfZ02C06xIqAsfJXqK32j0LPzPm
+GoRgN6w6LhJkXIBippqXTZELiJwj8+CiKNTBQKJMjGDmI0CN8kKuDdu37oudrHfv
+V3NuxPKbhIRG0brVXKKCfM3KzFT6ON7fgvIbbUCdg6CKLkWv5gnFEYnrZdB+Aq7j
+CIo/DOVLS6BLyR65gqOt706KvrfleocWsiCofptrXNBHh/k5Hsr+g2I6Zt8UJ1Ir
+U5D2/NGbmX3r0CPnlW4eVWbHTSL5cQe71bBp/SO0ZhQ7Y9t5Um4Rajrx5UXerV/0
+HV5HsnFUhGKVg6WrdiQtLJPQsEhJ3W62CYfVX78ul8fcim4v9ooLd/QRvu8e38DY
+Qav2PsrfBtidTJ8XWA/No4F62tAXl4rczWqyCFQZYmi+sEKUUSHRXPusK4VUxsoM
+v3M4zT8PjDVCf7vxqquemlHyYwBjupyZvbSCvhClzK+WRyMmyXHKXBBKKxn6yuR8
+NMv2wjSBgQpsXi4Cy1ZX
+=UPYm
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/nspr/nspr-4.9.4.ebuild b/dev-libs/nspr/nspr-4.9.4.ebuild
index 656ad6335eda..c6ae0fb6cb69 100644
--- a/dev-libs/nspr/nspr-4.9.4.ebuild
+++ b/dev-libs/nspr/nspr-4.9.4.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/dev-libs/nspr/nspr-4.9.4.ebuild,v 1.9 2013/01/21 16:27:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild,v 1.10 2013/01/28 04:37:36 vapier Exp $
 
 EAPI=3
 WANT_AUTOCONF="2.1"
@@ -47,35 +47,36 @@ src_prepare() {
 src_configure() {
 	cd "${S}"/build
 
+	# We use the standard BUILD_xxx but nspr uses HOST_xxx
+	tc-export_build_env BUILD_CC
+	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
+	tc-export AR CC CXX RANLIB
+	[[ ${CBUILD} != ${CHOST} ]] \
+		&& export CROSS_COMPILE=1 \
+		|| unset CROSS_COMPILE
+
+	local myconf
 	echo > "${T}"/test.c
-	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
+	${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
 	case $(file "${T}"/test.o) in
-		*32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf="${myconf} --enable-64bit";;
+		*32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";;
 		*32-bit*|*ppc*|*i386*) ;;
 		*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
 	esac
-	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
 
-	LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" econf \
+	# Ancient autoconf needs help finding the right tools.
+	LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" \
+	ac_cv_path_AR="${AR}" \
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		$(use_enable debug) \
 		$(use_enable !debug optimize) \
-		${myconf} || die "econf failed"
+		${myconf}
 }
 
 src_compile() {
 	cd "${S}"/build
-	if tc-is-cross-compiler; then
-		$(tc-getBUILD_CC) $BUILD_CFLAGS -DXP_UNIX ../mozilla/nsprpub/config/nsinstall.c \
-			-o config/native-nsinstall || die "failed to build nsinstall"
-		$(tc-getBUILD_CC) $BUILD_CFLAGS -DXP_UNIX ../mozilla/nsprpub/config/now.c \
-			-o config/native-now || die "failed to build now"
-		sed -s 's#/nsinstall$#/native-nsinstall#' -i config/autoconf.mk
-		for d in pr/src lib/libc/src lib/ds; do
-			sed -s 's#/now$#/native-now#' -i ${d}/Makefile
-	done
-	fi
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "failed to build"
+	emake || die "failed to build"
 }
 
 src_install () {
@@ -85,10 +86,8 @@ src_install () {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
 	cd "${ED}"/usr/$(get_libdir)
-	for file in *.a; do
-		einfo "removing static libraries as upstream has requested!"
-		rm -f ${file} || die "failed to remove static libraries."
-	done
+	einfo "removing static libraries as upstream has requested!"
+	rm -f *.a || die "failed to remove static libraries."
 
 	local n=
 	# aix-soname.patch does this already