Disable building of static ELFs for ia64 cross-compiler targets to workaround a broken gcc-stage1 libgcc #411677 by Michael Kosarev.

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

3 files changed, 32 insertions, 17 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 49ea64e0f67f..9262b8222146 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.830 2012/04/14 02:04:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.831 2012/04/14 21:59:46 vapier Exp $
+
+  14 Apr 2012; Mike Frysinger <vapier@gentoo.org>
+  files/eblits/src_compile.eblit:
+  Disable building of static ELFs for ia64 cross-compiler targets to workaround
+  a broken gcc-stage1 libgcc #411677 by Michael Kosarev.
 
   14 Apr 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.13-r4.ebuild:
   Mark s390 stable #382377.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 7384826fa953..0543408766ae 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -19,7 +19,7 @@ AUX eblits/common.eblit 9187 RMD160 cdfe1c09712ce768db308d0afea50fc47dde1c93 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 3886 RMD160 d2f86a2f404941bc7b6f6dabc29dd293dc2e9972 SHA1 b931c6dbc784f94f80f8ced2d2d0e1f0da4711af SHA256 be9c3dcef8315e52163b98631ea2c170c805f9accbaf5268df292574978c8e71
-AUX eblits/src_compile.eblit 5762 RMD160 d4c95be8567563e2d6075dfd90291b4870b09b15 SHA1 b53a77dc14a72ab4722147b6cfdc59d5ea4842a6 SHA256 8fd8021308a76283defec0f50e902815e08b2553fbec62eeb4b68e3b83516bad
+AUX eblits/src_compile.eblit 6197 RMD160 0ab223836d3f0d8d3dbdc4c1d5780380ad463933 SHA1 0a47f40b6a7a97d172429d41bc010a3f0bb17577 SHA256 52c1cd64e7a685b076b7e368938c1f101717d875ad1ef8127350677c14ddce0a
 AUX eblits/src_install.eblit 7470 RMD160 e21782fd708e57616b501a9920aeca72cea5cbb7 SHA1 2eed96771de35d77255f3957ff8023a53fdb4e99 SHA256 3a1599442d729d23f678b6582276ea6125855fe2f4c15f36851f89d441f4e145
 AUX eblits/src_test.eblit 1172 RMD160 a70e31e655cd3e306af6a498002de85b72258566 SHA1 4aec15e6ab67279258fd23400701fd38c106a38b SHA256 e5a390761b7ec613460b8da26df3ffe2a137217261dd9f87f2b78c3fa2a12727
 AUX eblits/src_unpack.eblit 5365 RMD160 2fe0b47df144f297682ca71e0f470fe0721ef39e SHA1 654dbad14c725a434c7244124fb257f13c6a1b62 SHA256 325450d632d373cbc03a7b8a0d07042ada5b94d573cf799fed88ad6d3915d1d6
@@ -66,23 +66,23 @@ EBUILD glibc-2.14.ebuild 8752 RMD160 c3482206a91b6584a53fcff6cee56bad61a4fa12 SH
 EBUILD glibc-2.15.ebuild 8527 RMD160 94c5f8e3b9410333e4c805349be94aee83e49dce SHA1 8b20c7ed8aafed829b1534de953adbcd5670da8f SHA256 db8dc4a7df484256f09121f6cd5809715624b093d8ceda3a6e89ac3dcc501827
 EBUILD glibc-2.9_p20081201-r3.ebuild 7693 RMD160 d29e97a48c7d73ad524b00ee84ace31482d6cefa SHA1 1d2bc39eab289370c28036e578eb8b1e08558a31 SHA256 48f8eb185d511128b482a84be56d4d3e7bd655ee01d408b09600efd1be5f8397
 EBUILD glibc-9999.ebuild 8352 RMD160 6b856a7d19ecce635402e7a19377c3c773b2ea60 SHA1 50c96ba402f80d6dc7655acf825d393f0839f5cf SHA256 a3dec3020bde78dff2315a72c6557491f2abf26698083b5d1c36c1d85e467905
-MISC ChangeLog 40115 RMD160 8bc288efbb04dc798179e878b358ca069e603054 SHA1 ced29dc56e0d4314f2660b4a368afcde7d1d0fb2 SHA256 a977c5002df13443ba81b5abb942c499785119617f23d9bdf872826a7c734222
+MISC ChangeLog 40337 RMD160 5cf6739340772ef7923b56469c3773c82d8f40bc SHA1 9e1dc8b5b0d251ee85c238bc2d6bbcc278914f5b SHA256 bf9522c651870c5636a6e587a1dca4747dcfcaa8bbac02bc608a82c5b7079c0b
 MISC ChangeLog-2007 108587 RMD160 cab72e91dbf79869f246537d0d99870a836cc61d SHA1 ab2825c549e4bfe385f7b3d477b594f2317c3b37 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17
 MISC metadata.xml 423 RMD160 cf6f12db580ed1cff7cf7287723daece896268ae SHA1 ecd822cb67d353dea55f6a07d0e14a4b3a3644a7 SHA256 9e9a0143eff95971cf35957f2334ba791557e6408fff8784188fdba70d48f4b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPiNtTAAoJELEHsLL7fEFWQ0cP/1clL8gGdkrbqtGWB80YVULP
-SaWd9xNqSa03NVBK8JvbO3p9bXe67GyV0q0RmdfPX9BTShWXvrf1y0VYQLHwE0rI
-WPPXKcAf9gj27K/5eG6Y17WCTkptI+5W+7WrsG54C5jQvTuD49zGEj8eHQW8XO5y
-U5+gnLlprijVzLawmQkWlq7aqoL/ny4IXb8TEMp1Q3udPQwQKA7p3Tq4PhU6q7pQ
-TqhECnZOUUQCD3NJhcjLB/BzjrEQBR8pTVDHpRD0p85Sz54D5Zl0H7yZi0nhdBjU
-Si+7bndBEiCJ+2dqFMaVmwm6onXji52KDKqbu29xVPAiL1X/5O76uQbwoMUmVL9q
-A1mHj0MfyAGAVvVz7+Yl4BdUn/uhAPWL2+ifRTNDX+nf/w8UO7ebA7zZSasmmmXM
-xmVZqbp++26CIPP2UzLGE7oqTuaE0p1hHFwVULfEbK5a3vF7aRg+ouMMhD0vI4a0
-fJ07TnWUJsni4/IBKeNyKCIJ2aQJ/Co3jIzsqOLRVMDSwHmD+dbeZ81GlQAPz5qE
-ntLXuUnK0qZTyWU5r/qRb14dHD+WZaW80zpc+HHzEbiiWa+b3geIPM0NGKIQjqZy
-IuBvVsIJez/iOIADfcoxzJxXK4Up10sNAMHjjgpgexlLUVyqFzfhDmBN/CGaJTkr
-svYQOOznFUVEYbCAlA2g
-=Xh8a
+iQIcBAEBAgAGBQJPifNuAAoJELEHsLL7fEFWEWwQAMeSi7Yai2SIlf6xSRgCLchR
+oHTLoNdeK/1idUcqCwX8F/vjlpfF2qGxwr2dW9V6S7lwkB4Ev2Gol3D7SXmT0QFF
+hKbwLszGxsYMsu9pTEyOylAVLTTQuiHVIfxYxjrEFEm5SuecrX2b1LxKEdquBp1a
++J0bIVePZdiyqw8ThyPjvbdiGLl41QWIoKgwabQePshdjntnYdRGBbBezpqWShqs
+kpwhmS8t0d2IFBv8/pHFaLChfPYLkusxUsjg4JyR45JCyIJ7DK7h2Vttbg2Fvkkb
+JLW6jib2ybWD1yKqv8r3bimDSWcn7VMGKulenDUJRSIwtjcEA/Be6TF68Y/H5m4H
+Y3iP8va6T2HYyItfM9gd8E8T4NpNDZ8fyeXbt0m1qRw25/PT9/N+2/VgIffC3bKV
+qUoh2vRos3HzOMGzE3tS87b0tqjoLC+zhk9ZX88kpNI5YZk+eH1NgTvjeoRdzb9c
+wfWlpEfLxfaYCB3HkEplPMsiESfa9cvaZYHPbHKrV5bftWAkVAGj3TOP8VOxRvdu
+Ihw0+DvbUJQKPVrE8AbTQzyiiKF3cA4OjoY58BFXUXxLDn2hNUin8oqeabUZvuxa
+uhQdjxoaheCXokMniZnzfM/H4cwXR5CkaQKKiS/vQJVY45KsLEPlf6n2IFrZNeZJ
+ouywzJCNKC33k9u/cKgj
+=FrCk
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index 178adbab89c4..e3fe02a31181 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-2012 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.23 2012/01/17 23:51:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.24 2012/04/14 21:59:47 vapier Exp $
 
 glibc_do_configure() {
 	local myconf
@@ -99,6 +99,16 @@ glibc_do_configure() {
 	cd "${GBUILDDIR}"
 	echo "${S}"/configure ${myconf}
 	"${S}"/configure ${myconf} || die "failed to configure glibc"
+
+	# ia64 static cross-compilers are a pita in so much that they
+	# can't produce static ELFs (as the libgcc.a is broken).  so
+	# disable building of the programs for those targets if it
+	# doesn't work.
+	# XXX: We could turn this into a compiler test, but ia64 is
+	# the only one that matters, so this should be fine for now.
+	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
+		sed -i '1i+link-static = touch $@' config.make
+	fi
 }
 
 toolchain-glibc_src_compile() {