Output more FLAG variables in our ABI summary, and make sure to reset LDFLAGS when building the target headers for cross-compilers #395619 by Thomas Sachau and Nathan Phillip Brink.

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

3 files changed, 26 insertions, 19 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 6dc367d17e7f..d27a0dc19d4f 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.815 2012/01/13 21:18:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.816 2012/01/13 22:45:45 vapier Exp $
+
+  13 Jan 2012; Mike Frysinger <vapier@gentoo.org>
+  files/eblits/src_compile.eblit:
+  Output more FLAG variables in our ABI summary, and make sure to reset LDFLAGS
+  when building the target headers for cross-compilers #395619 by Thomas Sachau
+  and Nathan Phillip Brink.
 
 *glibc-2.15 (13 Jan 2012)
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 5fff8eda96fc..b6b5b670beac 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 5777 RMD160 589394dbad302c02ba2ca75730938a9d58986980 SHA1 1b827f4f649924558a7c115614ffb20f841ffef7 SHA256 4fec8eb713125dd89c5d2e19b2499dfcca8796943fb437e419e417929c6d92af
+AUX eblits/src_compile.eblit 5807 RMD160 c80c77a7371292139db39806b39b4a117e0f580f SHA1 896e4d92471c98d2704ecef5b3931497aa7971cf SHA256 71f88d137f3f26c38a3f0cb4f7b7592d99a252f149338cce9c40e9b951841b3e
 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 5483 RMD160 f623d6a731227a5c79d30b9d00c1fd1d46f880fd SHA1 60abbd3a42424a4edeec748e4e9ebc2600545719 SHA256 9b24a56bd32bab9ec2f4e765addb2cda0ade81b4a2eaa637ef8dc223f0d62c5b
@@ -68,23 +68,23 @@ EBUILD glibc-2.14.ebuild 8812 RMD160 f756180e46e9a36d18728384398daa41b4a67fda SH
 EBUILD glibc-2.15.ebuild 8585 RMD160 fece5fba3c866b076e8e128871903e96a1ecc5dd SHA1 15b75a12db01ac1e037a8a1310ed23dd28b6340f SHA256 ff74485d51f3bf2df94f179a99a2c7d682b0ebb8ef424593db0cb81d6e2062ac
 EBUILD glibc-2.9_p20081201-r3.ebuild 7753 RMD160 7acecefa5c624837429358db505df5e863eaee90 SHA1 5494a83a774beb78d44e4e010e7c2e9af4c68dab SHA256 742005812b5a42b80a3ca4562b9b6b02661bcda6d77b5068a6e64bb6d20054bd
 EBUILD glibc-9999.ebuild 8412 RMD160 f9276abbc22e292c2a320305255b79640abead06 SHA1 e52ac36ce92000a17746f9f17651e27e757721c0 SHA256 cf715a05b552927634423b39c111bcac371d81ded6da2e9a67ed54bca3d2db6b
-MISC ChangeLog 37338 RMD160 e78c87fdac98e182fc88aa3a9ef4b353d3fab7a9 SHA1 dad5983e7d56e462b3ae7d08b1544911dc0c6d4c SHA256 a9f87feab45a13c988d5e481e49bed8632e29d8dbfe9fb2def0ad575ae3346af
+MISC ChangeLog 37611 RMD160 9a5f8afa39eeec87da0ba656e4e4a610d23575da SHA1 3fa09716df6f07c728d2b19f633efbd5aeae3585 SHA256 d121572b25d18768eed445c28191c19b76fea4ca09f7e83bddb81792b476bdce
 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.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPEJ+uAAoJELEHsLL7fEFW66cP/j9CpqNNxk5bwSslMtwjkJ1F
-rYxr3AXTqlKU4BwVtZR6mButnvRk/D/2NamJEv40uzckwIx5TOEnyvgNXHoAaGak
-vh7iu7rt7tfzKAa0rO+O/xOe6WcxsQ73bufkEyyGCR9y/WKawFbxbz5hzgDVt5pu
-j2Bl6VGX0Axz9Y4/IE8az3vXLHb28PhGteIyO53GajODMtS4Mi/VlHhiJFr8ou40
-UPvVdevMlnlsRiDmE7LCMZp43q5irsQ4i3r6rl4kDyGTYloDJlBsDYVgAswpEUHE
-MCnfOjMFEaIyZTYgshTx9DyPKyMtFi35ZZmcJRuASiICoqA37fKjTQ5uNkZh5DvN
-0yQtkJmP13KMKHlHjQWkexdXWbArajunCRxRGKENeJGxz1qaIc1OwN3KR9kp18FB
-JzOIJ5tJVYrjXWy71eJnFuEcf9BQdXYZV+b4Gh7cmYRYhFzTYSn1us+DJzMb0EVe
-ZRx4BSPDXf0wjb9D+EtjOnNEoUUNvSQRY8HM8ilWgkCphfvNYNm8YuRCdSCyeemU
-WTtwJAOESk/jv6BKU+lHYPtrQwSm4X3e54Svh+JLRC5PtFlVAjLmk/xtttW5Vws7
-KKquXdOZCAMEX3apdoj9z03jOf4VdhyLS8+Gg8OsbFgKvgdTmiKv+JJnMIZVQjrR
-V7Wl/k1/lPrtSVLyfkNY
-=qETc
+iQIcBAEBAgAGBQJPELQhAAoJELEHsLL7fEFWJ4sQAIjKu8mWwyQ/9nKgq47RhCBr
+G0wDPQVrpe9P+antKcf4XPZCUmlXeb2ZiSZr3EYt/cybGUkXQLkUFIEAyv8JCZmp
+jkqJr3TL+uhW2Ebk1XKfjDFCzrKWaRPWpqmLJ04v5DXQBkAb/J3SFd9LJ9hc/2zk
+kDeymcR+mbv4tph1I6Z4LnusBGXMCxLPgLXKZwl32AQbMvGYS0IKUJztOZphdAvu
+TlZSztSY62RbyKkG0EcSh4S/Sfl/GLrwNFt5yFgpk/mAGuxYGSINlKe+seOqoBHg
+fmnsMAz4zdq1k6iN9dbSlRmpxWCqk2PGqyitGqzSUBQvsgOu4Tp0MzRykb4DMNrO
+6HlAISrw0Z7/A2fOLvRM2pcWWtu0Yo2LzbISFf6frltQ/6/+aX05EE1KWhyiIZEo
+2RUGlajqqfFu3WDeTv9kHv8FltNNg2XvenKRedAShzwCQ5cemPiox8NGmeQOa0U+
+HHAREPap/au1GSy0DU9yxJ2wEi3BTjOdpjnxrt3+7rcwfN1pd2z8q9I84A3L2Lqu
+TiLr1wjstzjW6YVbUFMywjU3RmQG67+92n2/e0A4+RkQ7JRQAa3zXypaBbJpC75b
+drYj3Z+JhuvIOUz6FWN9wS0CeqbgXaGj6qEqmQW+8v2X47RjWXtaE+/EUsfYIRM/
+6v4bDeE6C0CH+TBA7r+C
+=MGtL
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index 6a77650fcf41..0c637bbb0c98 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
+# 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.21 2011/12/12 17:47:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.22 2012/01/13 22:45:45 vapier Exp $
 
 glibc_do_configure() {
 	local myconf
@@ -105,7 +105,7 @@ glibc_do_configure() {
 toolchain-glibc_src_compile() {
 	echo
 	local v
-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC {AS,C,CPP,CXX,LD}FLAGS ; do
 		einfo " $(printf '%15s' ${v}:)   ${!v}"
 	done
 	export CC=$(tc-getCC ${CTARGET})
@@ -170,6 +170,7 @@ toolchain-glibc_headers_compile() {
 	CC=gcc \
 	CFLAGS="-O1 -pipe" \
 	CPPFLAGS="-U_FORTIFY_SOURCE" \
+	LDFLAGS="" \
 	"${S}"/configure ${myconf} || die "failed to configure glibc"
 }