Short circuit header building in pkg testing and ABI recursion.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25 x86_64

7 files changed, 50 insertions, 25 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 61e2f76e8ad0..e598984786f4 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.586 2008/06/23 00:48:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.587 2008/06/23 01:39:12 vapier Exp $
+
+  23 Jun 2008; Mike Frysinger <vapier@gentoo.org>
+  files/eblits/src_compile.eblit, files/eblits/src_install.eblit,
+  glibc-2.6.1.ebuild, glibc-2.7-r2.ebuild, glibc-2.8_p20080602.ebuild:
+  Short circuit header building in pkg testing and ABI recursion.
 
   23 Jun 2008; Mike Frysinger <vapier@gentoo.org> glibc-2.6.1.ebuild,
   glibc-2.7-r2.ebuild, glibc-2.8_p20080602.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 56352896de89..376d98763702 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -106,9 +106,9 @@ AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 RMD160 9a21c9deb6ebca5d2245e3bb50
 AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 RMD160 f4e7df0cb25292afc13e18332569d2ca288fdf92 SHA1 7f34ef26d6607321e0ec5ad0f389cb1aedf5e0da SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf
 AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 RMD160 b674894f3b16f63193bb8040f8a5657dce82e1f9 SHA1 79fb3a4454b85af70dac95dd79134be3fe3a9201 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3
 AUX eblits/common.eblit 7207 RMD160 924980924697dc0b06b6d59977c1008c96b52c58 SHA1 e4afdaeae43eddffded45547b999d64af84a007c SHA256 80c99810d3e3d8b8780d476fec1bff4745655122167ffdfb13156e9e00c8da23
-AUX eblits/src_compile.eblit 5098 RMD160 fb08a8acb73e8ee9b9d5bff504d49608a1634843 SHA1 227ad8ba04ccfbf64a864a1f3be91bed51fd57bb SHA256 611b2c740a6c68124339194809ae36527fd171a2aa3ee2351f89cb18cdf9a7d5
+AUX eblits/src_compile.eblit 5101 RMD160 7a9247c080f57bd7e96ccac138aa9a3b5177f76d SHA1 820455589ca0c4cabb8a1359c1c2defc65d43d69 SHA256 e6fc8c8ea6427783209e4112b48e6b2e363eaf6a0d59f788b8c1690fa15b02db
 AUX eblits/src_install-2.6.eblit 7943 RMD160 5f5f10f513070e4c03818bd5f497201030e037f1 SHA1 5c9a76840456d6a12c157004774baeef30d27d5f SHA256 9a1fe141e9ecfb46fec5dac6ee32e9e03d8f838a22c7b9ae428247dab57e479d
-AUX eblits/src_install.eblit 8000 RMD160 5208f59424208a8efeef650af9deccb25515962e SHA1 07aca649bed25e45e97661cdabab9bb04ca1d972 SHA256 f608c49aec5efc49fe29197aeaeda94800cc8f7f4861eaacee3ad7e2bb72d6c9
+AUX eblits/src_install.eblit 8003 RMD160 449ef3e55a832f8407d4a6fc9237ae32bca922dd SHA1 830f2a841996903a95754f446dbf2cf3acc079f7 SHA256 4b0807f5b716209053fe607f001e80f9d0f818d994f96c294c1cc813be8d9eeb
 AUX eblits/src_test.eblit 1162 RMD160 349db09c5f2c2e412a108b8c5371adf946e1a3f0 SHA1 357ef650e1dce62d5d688133426bc62b9085009d SHA256 bac1db2da478f6e6709275c36cc1f9a98fac7fcc2e80bd8831f2077207754962
 AUX eblits/src_unpack.eblit 4913 RMD160 8e7bbd41471da82f1de31b04efe800cdd2d33b45 SHA1 e5557d70e89fa8e7eb6aebee9057d4920d5d336d SHA256 b8808f06e7097cfdbe692dc47bec5fa1fdace20eea3c9a32a17d5d81a4312f2e
 AUX fix-sysctl_h.patch 376 RMD160 b5dd68158224b09ddc42986be02351c74f81e0a0 SHA1 5601fbea6961368bcc192aef78e96ee2c5310713 SHA256 3a589f63fd1f3f6c5a00c66a10943d3d64630aefb1eb5b37e7f2a856fcea234a
@@ -185,16 +185,16 @@ EBUILD glibc-2.5-r2.ebuild 38677 RMD160 16c6bb911b3d97f1e8a9632f220f27b94a156833
 EBUILD glibc-2.5-r3.ebuild 38677 RMD160 fd1ba0c2b4a9aee52666be1b00bf67f5090fa04d SHA1 8838c614b1c58f5279a5e98389c5ea56ab2ecf97 SHA256 417b99032cd614026678bf3b83a4effab7e774d46cd2285f805d00ddbbf0d694
 EBUILD glibc-2.5-r4.ebuild 38679 RMD160 94adde51f8b61d6eeeffd917c0d03618f0e242b6 SHA1 b5ba47757ed8fd11e3a73cdf7491e3cea9a796d0 SHA256 3a8b5fca45f9511719a8abaca4d481b9c6813e9926aa48cae9983ad9b63417c9
 EBUILD glibc-2.5.1.ebuild 38754 RMD160 4f351c8e74913b579d558df61f7e85df1550a26a SHA1 45d207e25f3b8a1752dfb0df4bdac06945991c46 SHA256 d108a1c5a82bece216b4b469f234b9d5c979431d0ab2f053fbe4c873d9dd2ba2
-EBUILD glibc-2.6.1.ebuild 12292 RMD160 c753458ea55bca8e868e53d2f5e17adfd7746402 SHA1 20a8ac455cf8ef3330581f6c7235f12c858fb289 SHA256 7cd0f49183d6553fbf84fb6046a75496389ca5caf620b201620c081e2cf94308
+EBUILD glibc-2.6.1.ebuild 12430 RMD160 056395180d063f6294e42e403b28c3b9f38f35ac SHA1 c016d0e308814531864715aa24b62076f1e89017 SHA256 aa9139a7c9564b32c98cb904329c6d53c4ed909fb176b095c3cdd1643e216672
 EBUILD glibc-2.6.ebuild 39505 RMD160 87c1e6fd2f982345133c1bb85424cdb80a1b71c8 SHA1 1792f6be2d12f8a4c8f4759fb00e18754459cf52 SHA256 edb61c6412783b34b6071cad06c916bf075389543206698505f9a80bfb7edafe
-EBUILD glibc-2.7-r2.ebuild 12345 RMD160 0304a11d7717a5fe6bc909848fe4847716599834 SHA1 cba178dedd21bffafa00e2e80997ade52aa68f36 SHA256 763c0d5cb68f1fad559c3b438f84309176aa7ccc2873864deac11bbd142d9fd8
-EBUILD glibc-2.8_p20080602.ebuild 12976 RMD160 15e5a91ddf539b2be4937cb3f4f768970b7184e2 SHA1 7881e4f4a0d523c77580baa4ead91d289683c8d0 SHA256 0a013cd8f7f4abbf4eb31dc04d053a2246827e7fd349a51e1cde1149f650e0b8
-MISC ChangeLog 111063 RMD160 40eada785b2a7790a639ae0e4c37d5935d297c35 SHA1 806412828252dfefe3cf24c4daf903dfdab8dae1 SHA256 e799d0de807196a18aae90b4633184c2466743cccc696e090e83c085279c18a4
+EBUILD glibc-2.7-r2.ebuild 12484 RMD160 00d92fdaf19b9a4158db95be870a0b23cd28cbb3 SHA1 8c28700ca2ed67e4a1674d718dfea5ead7785848 SHA256 7ddeb82053480c614b6af6cc38f1d2009dc03422e873cb234b41a8081de5cdf1
+EBUILD glibc-2.8_p20080602.ebuild 13114 RMD160 917b2a9a492017b9163503af71fec6515e807bf3 SHA1 264b15084503d1c9e088306804405e0d4a2f1ec7 SHA256 acccc7aacf1d3d2275eae6a932b5bee74c583084a7486831d60060a6274b751f
+MISC ChangeLog 111317 RMD160 914f2366d35c5ac9c8d700f1526ff5a1bc78d6e6 SHA1 f3ba13829180443bdb2c70b0c8869d10b9fcc7ea SHA256 f4cba3d78ee5541c7cf29c7cc5069670b9e0652fee20c0157ed04ee1e979ddf7
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhe8vEACgkQ67wieSYcaxctNgCcDzYrn+IoRxj5rTEXpcYJFTxk
-1e8AoOgNEtewd8ZdjzCJgGXiCqBNBucy
-=TKOE
+iEYEARECAAYFAkhe/scACgkQ67wieSYcaxeaMQCeK9TSC6D+0tjjOXu7DvzjfRIk
+T3EAoLwf84dRxPNMd5BK/5vgEM/Mco4p
+=3RvS
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index 784829de538f..a1447d1029a0 100644
--- a/sys-libs/glibc/files/eblits/src_compile.eblit
+++ b/sys-libs/glibc/files/eblits/src_compile.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.3 2007/11/18 03:49:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.4 2008/06/23 01:39:13 vapier Exp $
 
 glibc_do_configure() {
 	local myconf
@@ -151,6 +151,11 @@ toolchain-glibc_headers_compile() {
 }
 
 eblit-glibc-src_compile() {
+	if just_headers ; then
+		toolchain-glibc_headers_compile
+		return
+	fi
+
 	setup_env
 
 	if [[ -z ${OABI} ]] ; then
@@ -173,9 +178,5 @@ eblit-glibc-src_compile() {
 		fi
 	fi
 
-	if just_headers ; then
-		toolchain-glibc_headers_compile
-	else
-		toolchain-glibc_src_compile
-	fi
+	toolchain-glibc_src_compile
 }
diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
index aa3e8a51c8d9..54465c4ae5ad 100644
--- a/sys-libs/glibc/files/eblits/src_install.eblit
+++ b/sys-libs/glibc/files/eblits/src_install.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.5 2008/03/23 18:06:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.6 2008/06/23 01:39:13 vapier Exp $
 
 toolchain-glibc_src_install() {
 	# These should not be set, else the
@@ -218,6 +218,11 @@ src_strip() {
 }
 
 eblit-glibc-src_install() {
+	if just_headers ; then
+		toolchain-glibc_headers_install
+		return
+	fi
+
 	setup_env
 
 	if [[ -z ${OABI} ]] ; then
@@ -241,10 +246,6 @@ eblit-glibc-src_install() {
 		fi
 	fi
 
-	if just_headers ; then
-		toolchain-glibc_headers_install
-	else
-		toolchain-glibc_src_install
-	fi
+	toolchain-glibc_src_install
 	[[ -z ${OABI} ]] && src_strip
 }
diff --git a/sys-libs/glibc/glibc-2.6.1.ebuild b/sys-libs/glibc/glibc-2.6.1.ebuild
index 19449b932395..0c3d455f5629 100644
--- a/sys-libs/glibc/glibc-2.6.1.ebuild
+++ b/sys-libs/glibc/glibc-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.6.1.ebuild,v 1.25 2008/06/23 00:48:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.6.1.ebuild,v 1.26 2008/06/23 01:39:12 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -264,6 +264,9 @@ fix_lib64_symlinks() {
 }
 
 pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
 	# PPC64+others may want to eventually be added to this logic if they
 	# decide to be multilib compatible and FHS compliant. note that this
 	# chunk of FHS compliance only applies to 64bit archs where 32bit
@@ -306,6 +309,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
 	if ! tc-is-cross-compiler && [[ -x ${ROOT}/usr/sbin/iconvconfig ]] ; then
 		# Generate fastloading iconv module configuration file.
 		"${ROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
diff --git a/sys-libs/glibc/glibc-2.7-r2.ebuild b/sys-libs/glibc/glibc-2.7-r2.ebuild
index 66fc9106acbe..cbaefce4196e 100644
--- a/sys-libs/glibc/glibc-2.7-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.7-r2.ebuild,v 1.9 2008/06/23 00:48:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.7-r2.ebuild,v 1.10 2008/06/23 01:39:12 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -265,6 +265,9 @@ fix_lib64_symlinks() {
 }
 
 pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
 	# PPC64+others may want to eventually be added to this logic if they
 	# decide to be multilib compatible and FHS compliant. note that this
 	# chunk of FHS compliance only applies to 64bit archs where 32bit
@@ -307,6 +310,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
 	if ! tc-is-cross-compiler && [[ -x ${ROOT}/usr/sbin/iconvconfig ]] ; then
 		# Generate fastloading iconv module configuration file.
 		"${ROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
diff --git a/sys-libs/glibc/glibc-2.8_p20080602.ebuild b/sys-libs/glibc/glibc-2.8_p20080602.ebuild
index e5d773e1959a..bca25df9f1f4 100644
--- a/sys-libs/glibc/glibc-2.8_p20080602.ebuild
+++ b/sys-libs/glibc/glibc-2.8_p20080602.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.8_p20080602.ebuild,v 1.6 2008/06/23 00:48:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.8_p20080602.ebuild,v 1.7 2008/06/23 01:39:12 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -295,6 +295,9 @@ fix_lib64_symlinks() {
 }
 
 pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
 	# PPC64+others may want to eventually be added to this logic if they
 	# decide to be multilib compatible and FHS compliant. note that this
 	# chunk of FHS compliance only applies to 64bit archs where 32bit
@@ -337,6 +340,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
 	if ! tc-is-cross-compiler && [[ -x ${ROOT}/usr/sbin/iconvconfig ]] ; then
 		# Generate fastloading iconv module configuration file.
 		"${ROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"