sh stable and improve the alt_build_headers() fallback case

Package-Manager: portage-2.1.2.3

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 6b856be33de323e5f1e03e094e349033fa22885d..53e1007ac9190d2b308049687512f36641cf9658 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -509,10 +509,10 @@ EBUILD glibc-2.4-r4.ebuild 39210 RMD160 fd782b08e862bd1889b9d6dc73386f6ff43ce676
 MD5 f7e1022963b4ac00d04110ef57c1a0eb glibc-2.4-r4.ebuild 39210
 RMD160 fd782b08e862bd1889b9d6dc73386f6ff43ce676 glibc-2.4-r4.ebuild 39210
 SHA256 d05fc7bf0c6cd701443f61328afb4e80ce6ff6d7d364de346cfdc297ffedc5df glibc-2.4-r4.ebuild 39210
-EBUILD glibc-2.5-r1.ebuild 38960 RMD160 d028cd23d69be502c97dd4829f7e43f63c305fdf SHA1 27fd25a85c38dabb500987645e9380e1f0182239 SHA256 f6357773a9b4599a86a77ff70ba08e080f6f25189873039d2bef243e4bcd5a89
-MD5 382c9f76bfd66b93beed92ef0b5384de glibc-2.5-r1.ebuild 38960
-RMD160 d028cd23d69be502c97dd4829f7e43f63c305fdf glibc-2.5-r1.ebuild 38960
-SHA256 f6357773a9b4599a86a77ff70ba08e080f6f25189873039d2bef243e4bcd5a89 glibc-2.5-r1.ebuild 38960
+EBUILD glibc-2.5-r1.ebuild 39228 RMD160 5437b2c40a0c8758e017c3aafdfd246d994664e6 SHA1 e130a2d1f32955d8942a3386d3995740a4d2392c SHA256 7efe4d61049d7847436580d7ea567f7ab77d0240c82841eeb99b3368c2fd97b7
+MD5 f469455cce2f993375e9e1a15c7ee35f glibc-2.5-r1.ebuild 39228
+RMD160 5437b2c40a0c8758e017c3aafdfd246d994664e6 glibc-2.5-r1.ebuild 39228
+SHA256 7efe4d61049d7847436580d7ea567f7ab77d0240c82841eeb99b3368c2fd97b7 glibc-2.5-r1.ebuild 39228
 EBUILD glibc-2.5.ebuild 37920 RMD160 f0ed4f2224d0788057479f08f46481b310a41c86 SHA1 07fea0d2d7b9d4fa25ea6f9729edd9cb3b68cf9d SHA256 95fbb9bfc9a1f964b51138413afc14eda068ce409784b78f19137fa157ca2d20
 MD5 1acffac4370ad139d4778d9f212a2f2e glibc-2.5.ebuild 37920
 RMD160 f0ed4f2224d0788057479f08f46481b310a41c86 glibc-2.5.ebuild 37920
@@ -555,7 +555,7 @@ SHA256 c4832b164cd2bc4473f8a9f2087920721ec40930c856f6ea8a2e2a0c97d516b5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGGKRj8bi6rjpTunYRAs9mAJwMJmxNZRbJc1t3HvlAEmUmiqkXqACgz25I
-ZykfpVUANb2olJxtRWFX+U0=
-=Mv+H
+iD8DBQFGHABQ8bi6rjpTunYRAo9DAKDUzq0bJKAvd0BZ6iaRjm4Eab7BIgCeOoNq
+uME+cC5LegnHcG7X0gYe1ic=
+=R76/
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/glibc/glibc-2.5-r1.ebuild b/sys-libs/glibc/glibc-2.5-r1.ebuild
index 934d3511212e85ab60a8e8d12eaa25d700e77a61..c2942c181a33b86eb69c4b4debb43639b97ad287 100644 (file)
--- a/sys-libs/glibc/glibc-2.5-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5-r1.ebuild,v 1.4 2007/04/08 08:13:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5-r1.ebuild,v 1.5 2007/04/10 21:22:48 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -16,7 +16,7 @@
 #  CHOST = CTARGET  - install into /
 #  CHOST != CTARGET - install into /usr/CTARGET/
 
-KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sh ~sparc ~x86"
 
 BRANCH_UPDATE=""
 
@@ -613,7 +613,13 @@ alt_headers() {
 alt_build_headers() {
        if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
                ALT_BUILD_HEADERS=$(alt_headers)
-               tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}$(alt_headers)
+               if tc-is-cross-compiler ; then
+                       ALT_BUILD_HEADERS=${ROOT}$(alt_headers)
+                       if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+                               local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+                               ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+                       fi
+               fi
        fi
        echo "${ALT_BUILD_HEADERS}"
 }