fix header searching when emerging into an empty ROOT #114923

Package-Manager: portage-2.1_pre3-r1

3 files changed, 24 insertions, 8 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 8c210de720ed..46ab2bb96268 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 c014e025d82fd893849cc310469efa6c ChangeLog 87943
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433
@@ -125,8 +128,8 @@ MD5 f8bf77d5057759d82db6401f9ff5211c glibc-2.2.5-r10.ebuild 4523
 MD5 38b924d6cb59fc2c7803540033aaa790 glibc-2.3.2-r12.ebuild 22475
 MD5 4c1b1e9c75fe7fbc58753d0ecff5a381 glibc-2.3.3.20040420-r2.ebuild 21706
 MD5 df67184db48138252008ff91e0cef2cb glibc-2.3.4.20040619-r2.ebuild 21380
-MD5 d578299067a293f9b23e7496d2591f86 glibc-2.3.4.20040808-r1.ebuild 27729
-MD5 8ca88e0313461666c2f3cbe3377e7201 glibc-2.3.4.20041102-r1.ebuild 34294
+MD5 e67d64767c058da9a992f207155d0650 glibc-2.3.4.20040808-r1.ebuild 27869
+MD5 c9960e58c934162d756bc22d4e0047a9 glibc-2.3.4.20041102-r1.ebuild 34434
 MD5 d0501b95beefec42d574b34ef0d0cecb glibc-2.3.4.20041102-r2.ebuild 41390
 MD5 dcc9e5194707e88476804f3a43d65517 glibc-2.3.4.20050125-r1.ebuild 39583
 MD5 2eb2b01004d8f68600c5e1aed8fed4ef glibc-2.3.5-r1.ebuild 40647
@@ -139,3 +142,10 @@ MD5 a09787da5d30d21f39b8865073910774 glibc-2.3.6-r1.ebuild 41913
 MD5 0b741711a143f0dc53840407b1802c5b glibc-2.3.6-r2.ebuild 41932
 MD5 71b3e23c1ecdb8f7a13538ccaaa8eb16 glibc-2.3.6.ebuild 40241
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDxFn72+ySkm8kpY0RArKZAJ4zetCe6hzF7OlFP/zS+H6/dY0d2ACgnGzM
++U/OctTjymyizWrJU1dK4bI=
+=QvfD
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
index 0df40cf8e001..a8c3f98d98ff 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.51 2005/12/03 00:55:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.52 2006/01/11 01:04:30 vapier Exp $
 
 inherit eutils multilib flag-o-matic toolchain-funcs versionator
 
@@ -671,13 +671,16 @@ src_compile() {
 	rm -rf ${WORKDIR}/build
 	mkdir -p ${WORKDIR}/build
 	cd ${WORKDIR}/build
+	# Pick out the correct location for build headers
+	local headersloc=$(alt_headers)
+	tc-is-cross-compiler && headersloc=${ROOT}${headersloc}
 	${S}/configure \
 		--build=${CHOST} \
 		--host=${CTARGET} \
 		--disable-profile \
 		--without-gd \
 		--without-cvs \
-		--with-headers=$(alt_headers) \
+		--with-headers=${headersloc} \
 		--prefix=$(alt_prefix) \
 		--mandir=$(alt_prefix)/share/man \
 		--infodir=$(alt_prefix)/share/info \
diff --git a/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild
index 0c0364a7b65a..3deae88ac555 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild,v 1.22 2005/12/03 00:55:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild,v 1.23 2006/01/11 01:04:30 vapier Exp $
 
 inherit eutils multilib flag-o-matic toolchain-funcs versionator
 
@@ -695,6 +695,9 @@ glibc_do_configure() {
 		myconf="${myconf} --without-selinux"
 	fi
 
+	# Pick out the correct location for build headers
+	local headersloc=$(alt_headers)
+	tc-is-cross-compiler && headersloc=${ROOT}${headersloc}
 	# Who knows if this works :)
 	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
 	myconf="${myconf} --without-cvs
@@ -703,7 +706,7 @@ glibc_do_configure() {
 			--host=${CTARGET}
 			--disable-profile
 			--without-gd
-			--with-headers=$(alt_headers)
+			--with-headers=${headersloc}
 			--prefix=$(alt_prefix)
 			--mandir=$(alt_prefix)/share/man
 			--infodir=$(alt_prefix)/share/info