Install all the same files with the cross-compiler so people can re-use it with native installs.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 16 insertions, 21 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index cb1ddb1823a0..aec8fa556231 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.804 2011/12/11 17:27:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.805 2011/12/12 17:33:10 vapier Exp $
+
+  12 Dec 2011; Mike Frysinger <vapier@gentoo.org>
+  files/eblits/src_compile.eblit, files/eblits/src_install.eblit:
+  Install all the same files with the cross-compiler so people can re-use it
+  with native installs.
 
   11 Dec 2011; Raúl Porcel <armin76@gentoo.org> glibc-2.13-r4.ebuild:
   alpha/ia64/sparc stable wrt #382377
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 08be8693184c..618965c3722b 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 2.10/glibc-2.10-gentoo-chk_fail.c 9407 RMD160 230701dfacfe2481eb49e5384fe4ebb508bd3af2 SHA1 0e9330d57de714dd1ecd7040d3eabf4723cdee7c SHA256 7745c0f5d37b37959b43b41e39762fc35b877161bc5740d9d3e9a83021acbc0e
 AUX 2.10/glibc-2.10-hardened-configure-picdefault.patch 865 RMD160 744bdbfb73f1dbced4cb33cb5aa92f3b41d3b4fb SHA1 21e0f83598f5342032a794315f0e3dac07f647da SHA256 b50b29f85d88011555bbcbe6046e6600be9344f2d78412b14aebdea515420774
@@ -19,8 +19,8 @@ AUX eblits/common.eblit 9323 RMD160 aa42c1ca5b73b68bb6d022355dfa7e149091f23c SHA
 AUX eblits/pkg_postinst.eblit 1159 RMD160 4b99846819bf0471d1104a8a17dd260796644f9d SHA1 4a2980fede3edebc7960d40db7cf935c7c854859 SHA256 76c403cf5c77a3a3bb7441566335f0c8da2584eaa21f05ab400e7bb00f9db810
 AUX eblits/pkg_preinst.eblit 3469 RMD160 a8f0831802ea5b5bec02b6379f08cd5f4f0ad27a SHA1 31a9a0815f11bd186c27d3cc44a394e4aee754be SHA256 7f947a83488dccd4c5169508d7c125d09fdd30ddd07d98b528ad12d83b9e2730
 AUX eblits/pkg_setup.eblit 3146 RMD160 f0575822d5364b5167c17ea7b0aabd821b61fb19 SHA1 e5e55694c18a4c7b8df2e76586866894b018f04e SHA256 c4a59e35b3c5847fa24cc35fb4af4c190a057587453ac8c463244189ff627d74
-AUX eblits/src_compile.eblit 6030 RMD160 07c1916050bac9c13e472ea5b4c7f08d2fc80787 SHA1 b09709b15f37f029bad44f6f48ed50b5bfe6ce7c SHA256 4efa7dc520bc3f015f99816717f9e781e81fbdff3cfc8e41baf7e637520b206f
-AUX eblits/src_install.eblit 7712 RMD160 fa8276a921a9e16d2e1f5d39d0691f6b85162d98 SHA1 f217e1f2d53552e15506d6e1e1659f458168ef59 SHA256 8048ca748418e22faa6dbeb17eb35827170b3f8a196976dff32c29cfbb28cd67
+AUX eblits/src_compile.eblit 5832 RMD160 9d5cbc2b1d202d6dd184a5d232ccd69e6175e634 SHA1 dbd1263d031917cfb807d61df81726f84cc2f261 SHA256 9bd476aef4d89a991d36755e5599c833eeeada6994339aa5bc31519398d29c10
+AUX eblits/src_install.eblit 7530 RMD160 40226c9ef9975b7f055326b660338d6cf288082c SHA1 a4ff814e0d6ca59e6ffbff7626c1230958f70370 SHA256 4b1899e2669657ace7fe225b9f737891ae57b455ea5b88d7d844a7858110eeea
 AUX eblits/src_test.eblit 1172 RMD160 a70e31e655cd3e306af6a498002de85b72258566 SHA1 4aec15e6ab67279258fd23400701fd38c106a38b SHA256 e5a390761b7ec613460b8da26df3ffe2a137217261dd9f87f2b78c3fa2a12727
 AUX eblits/src_unpack.eblit 5848 RMD160 8012ba4a31e689080ec2d70156c503b0c36e3119 SHA1 5aab07c312c3ab0624ead0e0a7f7d5cecfe1bf00 SHA256 19f73007557718580860a6e1b7613b4a69a4a639f17a9d3cb9ca2aba9576ccca
 AUX nscd 1621 RMD160 f6d20c4c3814f70d7741f3fa2e0b53ba32c37960 SHA1 5751fe798024c2021b7b3ed3e798618e2a38244a SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8
@@ -62,12 +62,12 @@ EBUILD glibc-2.14.1.ebuild 8790 RMD160 f1e9c7f95d2486e79303e7d94a259c224344c171
 EBUILD glibc-2.14.ebuild 8789 RMD160 2526d5682ba5214e88ac1daa1afa46607f53093a SHA1 3cb67afb2d3606f78047ce96c014fd4a7286018a SHA256 1df3c918ad3a947b54bbd8e6b6e6eb441705d4cb9c561228096820dadc045503
 EBUILD glibc-2.9_p20081201-r3.ebuild 7753 RMD160 8d14a32be1c680e21128552fff3e7299710b0255 SHA1 92f5182dce11c5a77e91ebd9129c2c6ff6938974 SHA256 b90aa298fd49569090f711b2bd9368a66c73cb6c37e85525d1d929ef70e09a5b
 EBUILD glibc-9999.ebuild 8789 RMD160 cb7c0aa7866c031533846c94dd632d26cde8b064 SHA1 e3619da20d49aa6b358b6c95b83c94bf34e5bfe4 SHA256 9e7a7444b0aeb1cd27e5689a94a029c637627971f4fd1fb2e4361a0e7b3d6fc9
-MISC ChangeLog 143411 RMD160 80a1bbbc25875af272284b0e127af778efa7a2cd SHA1 5c99bdf9b41a888b6d1971281215768bbd9106a9 SHA256 9acb60226edda698a1bc33df23c3d989cd877baa9af6e0adf5e832faa07bc317
+MISC ChangeLog 143628 RMD160 d2effa8e8bb65a2464016a344f19251aa4696f84 SHA1 b78114e77ae9bdf031ab800c25a0c81ad09fa6a1 SHA256 aeffe6505e9326133a0bbedf1937b0b124ccfa7fd10186082b9d0bc476311566
 MISC metadata.xml 423 RMD160 cf6f12db580ed1cff7cf7287723daece896268ae SHA1 ecd822cb67d353dea55f6a07d0e14a4b3a3644a7 SHA256 9e9a0143eff95971cf35957f2334ba791557e6408fff8784188fdba70d48f4b5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7k5/YACgkQuQc30/atMkApQgCdHV/5kGMolLost/BxvO9YjQAg
-SbwAn0JvIb9R6D4vmaWsPob6ED9MD/m9
-=/7Lo
+iF4EAREIAAYFAk7mOt4ACgkQaC/OocHi7JbGYAEAmQrDsAui0IDUKz7i1vFbMqFB
+UukKY7LbExo2EDvGAi0BAJ883QBW62Ed4b4uez2ZdjFJCAqsJhIbs4x7es++/0Il
+=JNmX
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index 0a44688234db..b11639148c72 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-2011 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.19 2011/10/11 21:20:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.20 2011/12/12 17:33:10 vapier Exp $
 
 glibc_do_configure() {
 	local myconf
@@ -102,10 +102,6 @@ glibc_do_configure() {
 	cd "${GBUILDDIR}"
 	echo "${S}"/configure ${myconf}
 	"${S}"/configure ${myconf} || die "failed to configure glibc"
-
-	# since we'll be punting them for cross-compilers, and they can cause
-	# problems (ia64+static), we'll just skip building altogether
-	is_crosscompile && sed -i '1ibuild-programs = no' config.make
 }
 
 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 00680eaf2221..264dd1a0584d 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-2011 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.18 2011/12/09 04:53:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.19 2011/12/12 17:33:10 vapier Exp $
 
 toolchain-glibc_src_install() {
 	local GBUILDDIR
@@ -21,12 +21,6 @@ toolchain-glibc_src_install() {
 	fi
 	emake install_root="${install_root}" install || die
 
-	if is_crosscompile ; then
-		# punt all the junk not needed by a cross-compiler
-		cd "${D}"/usr/${CTARGET} || die
-		rm -rf ./{,usr/}{bin,etc,sbin,share} ./{,usr/}*/{gconv,misc}
-	fi
-
 	if want_linuxthreads && want_nptl ; then
 		einfo "Installing NPTL to $(alt_libdir)/tls/..."
 		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl