Refactor header compile logic a bit to make it a bit more standalone.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 32 insertions, 26 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index af309018d7ff..cff05a905865 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1016 2014/09/10 07:41:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1017 2014/09/10 07:46:43 vapier Exp $
+
+  10 Sep 2014; Mike Frysinger <vapier@gentoo.org>
+  files/eblits/src_compile.eblit:
+  Refactor header compile logic a bit to make it a bit more standalone.
 
   10 Sep 2014; Mike Frysinger <vapier@gentoo.org>
   files/eblits/src_compile.eblit:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index ffcac2ed9079..371709fcdba0 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -27,7 +27,7 @@ AUX eblits/common.eblit 10280 SHA256 2294af7912518f2a28229a3baaac0c2faaf0577d408
 AUX eblits/pkg_postinst.eblit 1081 SHA256 21c349d6999841b277dd00ed6f2bf4b33d14724510da3c15a99e775cb71bd180 SHA512 b491761a0923b779535b4a5abf6e00efb6f2c0bbb68e7fb01b2cad54034b63ddfa271afce16b17b17b53ac809ed869c55f94c44443d661052779770f4302318b WHIRLPOOL 8e3a3f35a4cefa903bc578d2fb6b22506f3ac94939f9ad1e703f470b13ba0fd3353061e38e3142ecb5c693749c84d4a1e4f4a5920e36ce20dc2f7e3b6b67ed9f
 AUX eblits/pkg_preinst.eblit 2608 SHA256 e49f274efe309b4bfed88195d413afa3363f40fb6c2caf50b4ab8ce5ab548864 SHA512 debfe0679d51eff7a154f7772179cf6bfe01beacf63fe101370c172e71b0524da0ceb7b0571e69a8050e5b75953b1d4c8968e1982ff4bc7362caeedde0be595e WHIRLPOOL 7b5c69c319651d860b3495d658b7275308f69504050699aada21ce5ecdd3114c1ea50ee7eac4436ee33738d02a0eb4bc6fff41484ff840aa2400bdd484ae3e93
 AUX eblits/pkg_setup.eblit 3953 SHA256 b062a64b9206da83f36260e6f99d812014c826df06d339b32ac5f6975986c6ef SHA512 c4dd7e73c335bba90d2c3788f4a9b35e0ff0e9cb1ab91a2ccf72fba9fc466b72fcd3e21e6f2e2c0b479a6dd55770824160a7e0288a84e7282d7d9241c087eccd WHIRLPOOL 7c1379d190de749871fef339b3eb8789b82e65a417e90bb04075ae34d0c999c5516918a3894782b3bc632ef2b772b206aad61afb18222cc438c13fa4c263d75f
-AUX eblits/src_compile.eblit 7719 SHA256 d17a7ddf94c48357a43b629352be5d10b6ccc9976e3e139f0439527ae03a4a23 SHA512 dbbaf5f74d67e37471cf621f69006d21287ef41a2007c58456986885fc3a31282ca970eb2889df139e6fea6a78654d53609474ede631af151f2270f6d9c6e967 WHIRLPOOL 7e8f35e3b44fe81b1be6b6dedad81d09e562ebf4ce1acb59f8fd8904b1fc8acd124c4486b69f794220cb6d7f61cf62faa70f71319ecf9f0828d714bd869d4b6f
+AUX eblits/src_compile.eblit 7733 SHA256 a491a52b0747ef4ddf0dc63e06debb237b25d129540bcab411a20a0d8067c7c2 SHA512 4aee3ad7261bb81fc835df2aa54afac176e3d7b0c13340328143b0b0ecbe983e74ef7f0462c15e2b0693d7461c3b183da0a450b92aa22d3b6c6d011b257603f3 WHIRLPOOL 218731f038919816ebdfa7a0ebb92deb2f888818e8b4b2d67e2b32457212d8cf1918e11fd34d6344a831c21fba148f1a4441d8c4a4e7500488d45b45645a3262
 AUX eblits/src_install.eblit 8681 SHA256 278c35396d4fde96305e79cb8e8c6f46c45570b2649a4be535f76222b00b4b54 SHA512 9a159b3cfd91c95471e14559252306b8b59e25a8c3571f2835e9b83ffa05d39698e6c24027b9a0f5fc942ad420bc2cfd6495f63eccd3fa7b450f183c979eafd9 WHIRLPOOL 764955f64d16dbd3fdc20ddcc4c622c1c72b3ad96a94102990da61a095727ee28a3a0f7764c0ec0ea111da2a13ba471c4d50b21deb5e57356dd22425c0842281
 AUX eblits/src_prepare.eblit 2344 SHA256 7898682539bc85f126e491bc9c9a727cc5d922680f91dd409aec50c068ca93aa SHA512 30d706f26475db2dfe8cfaaa003c3a21988328ba0cc7cdca439d248c968430308d8d0afefa60302315d4c76011e4de51925307ee19d15eba10e24f1ede2b956f WHIRLPOOL 3a5ad0de18649805d97b0d78ea33e52608e7b6694ac567313db9e09da18a0bca9b95a027fe0181b50738b5bfe83ac49254d29b077cef36fb311a9707683261b5
 AUX eblits/src_test.eblit 1254 SHA256 d487b91ce19218829590ae9776420f8172f4cd0efd01ee0e19be3f744170dbc6 SHA512 6d889366b57b001472fb4c595bc7e4416ee30fdd58a20bbdc88edb63ceb0b79cce8db1bb9a54c6c14f6fc0711bcf20bec91d84706fff08892fff2ccdcb870854 WHIRLPOOL 73731e13688ba0573b72a562244b5ec95cdbff11e41a0b0810d6d70fdbfa06e18e9b7d5facb5f03c435da96c3216645df071d994a07522f357cf0465819a903a
@@ -100,23 +100,23 @@ EBUILD glibc-2.19.ebuild 6912 SHA256 3a11e60bed77cc2dad678ad97ed7a959a59a91a94ca
 EBUILD glibc-2.20.ebuild 6154 SHA256 7dea0ee804ebe1a6268155c519b85b9f265a964d570f68490a3035467f928f98 SHA512 11a594c74fec00b919ec98ece7d82ef8404280913b2f3047c0076c822234f99f8a9e67cdf1384ee4b52bcc25a381bf5706a85204adda90b0d914035db4338865 WHIRLPOOL 5f2cb7a927f6d317fe4cec4482a56b95c1464e6f46e810c9c5c02b06fc10aa51a3c2cec217bf6c339f18b7e30c296b72d8ab7fa85570bbe8bd49aec16b6b5720
 EBUILD glibc-2.9_p20081201-r3.ebuild 6787 SHA256 3d9ff2b86df088b8e8cc082c5ddef164b48cffcccfa2ea001306e79a6d52a52c SHA512 7070020105a777bbf6d846fab291b238d7861472c737031e8c52b6d5c2a0524e228b724751325448ce94a42ee39112088b91d0597cd2cdbcc68c51248d2d5a11 WHIRLPOOL aa0e2d11377c3a30478afbef0fa3daa12aa9711d68dc92ab08fca999e599c613648644da2e6f81c38dc98192ed26934c4a35418a97d3146650cd4c82e39a7fed
 EBUILD glibc-9999.ebuild 6839 SHA256 3d51b4a03932748b6716fdb1c63f6c083651f3d1bae585c989adf0c106c86d58 SHA512 14339b49e597d744e488ccecb17eef69ee22f2a49cf69a280377816cde522e56abf690c487a9cdcb396ef8084b165dd716956c02ee16bea45f39a0875ef2ffcd WHIRLPOOL f52e905e4f29d7d3e9da861028eae695160d1aff250060748e5ee5da2eb4b39a895ddf0a5fa3995f844631cc89f114e58ff9ac603b4c76f6bc36ed6855f037cd
-MISC ChangeLog 69840 SHA256 19e5fb253b169ebdf69498f3a424b0157cefd9deb09f504be9fea3e640c08ec7 SHA512 51cd786157093a14568983f64a26cf9119d0e7e24cde6fdfe7b95fa7f9856193ca7053165a1c09def99feb7e6401f96c7a281ffc1293853bfa8dda65e2223a01 WHIRLPOOL 90bd80f4f898b45bb070d3d763f02f7cc9ed0ebcd68e5a8a908b3ff0b7c4394d58aea33bfc326af504496e95e84c93e6f9be27afd38fd66c476f080b83d05424
+MISC ChangeLog 69997 SHA256 018739bae8518d2f504fbc327de641d7757849541a5b43ac76641efa55e67250 SHA512 09fa95e8ff9956327b170bde7c6e5c47f190e7179cb4750700a028d4b07cad5a6142a81ac50160d4a562b9ada219ff075866c4e26b81f578a96b38e886074837 WHIRLPOOL 928603ac81257944ceae9b0ac6416326c8a3bd012a731acc2e586e1988eab6a4b06228eec802a94543b74454ce4fa8a1d7cc30cc25302a13e3de213e93eeb55c
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC metadata.xml 724 SHA256 b9d8df62b36ae314b29a3177c534495036ef97a819c152247383e907004fe4dc SHA512 8c215338bbf47de95f40f9f24c50d107ec0bbe4a47282d3cbc253d4003db85a88c542aee33756dd9d2d2ec4c70992009261d821a8c145c24c24d2ad448595b77 WHIRLPOOL 954f5d080c7219ffe85e128eddd05c74a32a457219d423441bb58d54a7de1786da6a2efb541861b3bfc93a9acf2ae6f79168d1ccc37385f84af0eb439fff2954
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUEACUAAoJEPGu1DbS6WIASR8QAI4OWwZSvnnJzknFzk3hM+fk
-yJrZSE23r5HruPoI+rDOdce2R+jQVB9YcjehrNhA55bgKaIlw3vjrTBbAznXkEyd
-Ks7gJ9eSFWXJwn/8Bzm31oZpuO9EcVEab8yUxp2a7QrigX/DZ1ROKQ1QDuLxgOew
-FRgJE4WLA70tcPi+u+CqtoZJBOg1Y+Tc8JJPODK1Z2r0DLoGzNCcradAmH3S+7Wc
-7QrGDfjy7GUzmCvCuVpcvHErT+JqEucufUPTj4o3QqDw3c4eN1xzTmZNI/rXAbMo
-StZzg36L4+dqSSR15n7u2QSbvzyION7fJ2Lr4XwG3S+CqKZatA3HyG0EvKqKEN6w
-XXedxd2F7g5lmW9rx6jL6qFf4MBt1YTqhsaW8Me6mH+Zau8ahm8geN8erMTny14O
-q2Iamx2EWbvJ+TplIyTdIVAf5qIluONDNNLAtw2CYnR3SAVt3ybmxR/5AzEs+vgk
-7I9u7DQioZPOKLwT68t2/g03yd8ESRHWnTEZEOQYt09PgL2mf7nJyZ/JWzfLU7Sj
-qgYhaKZQkAvoM5wf0pZsnC7OVDmWN5oroPfJgVWC0yP6yEglXmylUsaRitk0/B2p
-ZYuZNAzggL1aSWR51dEgHCiH3554ODSreQANIvRVXlWIErCQxVPkkCX02we5I5gU
-bE885w5tLfp2T45WDzl4
-=/9fs
+iQIcBAEBCAAGBQJUEAHkAAoJEPGu1DbS6WIA/G8P/1hKjveQnegdlwPDgJfgmACb
+f8o2kavP/Mbj1afrML+EIv8zyRd0h4l7hdehC3A2oL+WbM8bTyMMQDawurzqciFs
+k/WbtEktvA234BCHEtebstNPOtM0ZgQElyqFD+jlZlRl30m8rmu2e4TDAij1g8xT
+TQ+tukXRGtViNkSufcYTL2efpc47/MXXZxqZ6QI9PGmn1XNMB3vD71llvuZ6/aMn
+SydN2OL/sAKuNgnfhi2Vfb1IkEyllWNt42bIx3Fxx95hIFiPG0hnQpNzHThpCLud
+dF7HqDu4rOjVOVGrj7WqYjL5oV2ORbEgryIGEQUhi7Yq1e/Gg0BaPSZNz5O2fBd7
+dcuuP6/+ud0+oGe7KhMR0nvhH7iCMErlzAtGga9/npPkmumTO1tKx61NoDQewP/N
+JU4IKWhMdZxmgGDfgfaeC5cyHCQ1ldrHINcdWTAuAM6ncS1NIOEerCIoWLoUpBko
+sPZZvCQnwB9ra4/ByNJHea4ung0PkxQBCDGc5UyIZMJtiWeZdvk/hVhQgvMrioxq
+YsUxc7SwwVmj1A/RMMAIVxgD9Ivueqb3z1QSeLSS9t3mu9W4c0HLjgR9Fa3q2j4p
+C7zMHR6JpbchgmY4bZOvH90CDmihW9yZ0BpZpwhIVjgknIBCK89yHnVLc7zPSdb+
+Yz6NoJi+FvFz/jB8j97J
+=Yuro
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index 0aff037f4477..ae3673f02723 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-2014 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.42 2014/09/10 07:41:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.43 2014/09/10 07:46:43 vapier Exp $
 
 dump_toolchain_settings() {
 	echo
@@ -174,6 +174,8 @@ toolchain-glibc_src_compile() {
 }
 
 toolchain-glibc_headers_compile() {
+	export ABI=default
+
 	local builddir=$(builddir "headers")
 	mkdir -p "${builddir}"
 	cd "${builddir}"
@@ -186,6 +188,8 @@ toolchain-glibc_headers_compile() {
 		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
 		libc_cv_asm_cfi_directives=yes
 		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_forced_unwind=yes
 		libc_cv_gcc___thread=yes
 		libc_cv_mlong_double_128=yes
 		libc_cv_mlong_double_128ibm=yes
@@ -225,10 +229,9 @@ toolchain-glibc_headers_compile() {
 	)
 
 	# Nothing is compiled here which would affect the headers for the target.
-	# so forcing CC/CFLAGS is sane.  unless you dont have `gcc`.  then i
-	# dont care :p.
+	# So forcing CC/CFLAGS is sane.
 	set -- "${S}"/configure "${myconf[@]}"
-	CC=gcc \
+	CC="$(tc-getBUILD_CC)" \
 	CFLAGS="-O1 -pipe" \
 	CPPFLAGS="-U_FORTIFY_SOURCE" \
 	LDFLAGS="" \
@@ -236,18 +239,17 @@ toolchain-glibc_headers_compile() {
 }
 
 eblit-glibc-src_compile() {
+	if just_headers ; then
+		toolchain-glibc_headers_compile
+		return
+	fi
+
 	if is_crosscompile ; then
 		export \
 			libc_cv_c_cleanup=yes \
 			libc_cv_forced_unwind=yes
 	fi
 
-	if just_headers ; then
-		export ABI=default
-		toolchain-glibc_headers_compile
-		return
-	fi
-
 	setup_env
 
 	if [[ -z ${OABI} ]] ; then