force newer version of headers on hppa and relocate simple tests from src_install to pkg_preinst

Package-Manager: portage-2.1.2.7

2 files changed, 37 insertions, 25 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 3828d0d5676b..0f0f794dbf11 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a SHA1 d1dceb79689e9c627ebd630389ec1948d7a0a6e4 SHA256 0bc07eb47578d5bfb98774b18bf07aee2af44a7ccd947602c223b34e0d88394a
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
@@ -511,10 +514,10 @@ EBUILD glibc-2.5-r1.ebuild 39228 RMD160 5437b2c40a0c8758e017c3aafdfd246d994664e6
 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-r2.ebuild 38588 RMD160 6f48a6dc15260b6e17d074d3cc7f9748659ef071 SHA1 3e449374c5a6109b9e3893b973110f15bbe0d6a4 SHA256 e99affb027bbba82092bd5056d945cfe4254785465ab7a9ba65d4b621610def1
-MD5 e46b9d4ef2be558e9e0b94328b2841b2 glibc-2.5-r2.ebuild 38588
-RMD160 6f48a6dc15260b6e17d074d3cc7f9748659ef071 glibc-2.5-r2.ebuild 38588
-SHA256 e99affb027bbba82092bd5056d945cfe4254785465ab7a9ba65d4b621610def1 glibc-2.5-r2.ebuild 38588
+EBUILD glibc-2.5-r2.ebuild 38596 RMD160 ab96e71227d799e23481655e5822c8817acf1c24 SHA1 8dd3b15dc9bf3d25e9f7a0ccabafa238589e99bb SHA256 60653e59b8d1dbf8610d6e3ffcd82cd41459a0e31da09d8169ada7eb733f928d
+MD5 97db29a5000d80129ed419703311609d glibc-2.5-r2.ebuild 38596
+RMD160 ab96e71227d799e23481655e5822c8817acf1c24 glibc-2.5-r2.ebuild 38596
+SHA256 60653e59b8d1dbf8610d6e3ffcd82cd41459a0e31da09d8169ada7eb733f928d glibc-2.5-r2.ebuild 38596
 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
@@ -557,3 +560,10 @@ SHA256 c4832b164cd2bc4473f8a9f2087920721ec40930c856f6ea8a2e2a0c97d516b5 files/di
 MD5 bad11563ceda904710ef26f3c5377425 files/digest-glibc-2.5-r2 1280
 RMD160 d53b528ead8d76bfc42d9b51142058a2994e6d7f files/digest-glibc-2.5-r2 1280
 SHA256 bf7dd47ded105b17eff75fa0be15cec59e3fdb1809fb541f9ff492ea3e0d50aa files/digest-glibc-2.5-r2 1280
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGSwpQ8bi6rjpTunYRAmwvAJ4p06XoQCwXJYaAi5bpcjfUocwtngCgkpFV
+f8Q55L29oBqPjLCL2Q+6LkE=
+=L1zY
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.5-r2.ebuild b/sys-libs/glibc/glibc-2.5-r2.ebuild
index 3f4a70e430be..b1f12de9838e 100644
--- a/sys-libs/glibc/glibc-2.5-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.5-r2.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-r2.ebuild,v 1.12 2007/05/15 06:53:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5-r2.ebuild,v 1.13 2007/05/16 13:41:23 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=""
 
@@ -72,6 +72,8 @@ GLIBC_LT_VER=${GLIBC_RELEASE_VER}
 NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.9"}
 LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"}
 
+[[ ${CTARGET} == hppa* ]] && NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-2.6.20}
+
 ### SRC_URI ###
 
 # This function handles the basics of setting the SRC_URI for a glibc ebuild.
@@ -326,6 +328,23 @@ toolchain-glibc_pkg_preinst() {
 
 	# Shouldnt need to keep this updated
 	[[ -e ${ROOT}/etc/locale.gen ]] && rm -f "${D}"/etc/locale.gen
+
+	# simple test to make sure our new glibc isnt completely broken.
+	# make sure we don't test with statically built binaries since
+	# they will fail.
+	[[ ${ROOT} != "/" ]] && return 0
+	local x striptest
+	for x in date env ls true uname ; do
+		x=$(type -p ${x})
+		[[ -z ${x} ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null)
+		[[ -z ${striptest} ]] && continue
+		[[ ${striptest} == *"statically linked"* ]] && continue
+		"${D}"/$(get_libdir)/ld-*.so \
+			--library-path "${D}"/$(get_libdir) \
+			${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
 }
 
 toolchain-glibc_src_install() {
@@ -507,23 +526,6 @@ toolchain-glibc_src_install() {
 	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
 	# creation of the "factory" symlink in pkg_postinst().
 	rm -f "${D}"/etc/localtime
-
-	# simple test to make sure our new glibc isnt completely broken.
-	# for now, skip the multilib scenario.  also make sure we don't
-	# test with statically built binaries since they will fail.
-	[[ ${CBUILD} != ${CHOST} ]] && return 0
-	[[ $(get_libdir) != "lib" ]] && return 0
-	for x in date env ls true uname ; do
-		x=$(type -p ${x})
-		[[ -z ${x} ]] && continue
-		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null)
-		[[ -z ${striptest} ]] && continue
-		[[ ${striptest} == *"statically linked"* ]] && continue
-		"${D}"/$(get_libdir)/ld-*.so \
-			--library-path "${D}"/$(get_libdir) \
-			${x} > /dev/null \
-			|| die "simple run test (${x}) failed"
-	done
 }
 
 toolchain-glibc_headers_install() {
@@ -536,8 +538,8 @@ toolchain-glibc_headers_install() {
 	doins misc/syscall-list.h bits/stdio_lim.h || die "doins include bits"
 	insinto $(alt_headers)/gnu
 	doins "${S}"/include/gnu/stubs.h || die "doins include gnu"
-	# Make sure we install the sys-include symlink so that when 
-	# we build a 2nd stage cross-compiler, gcc finds the target 
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
 	# system headers correctly.  See gcc/doc/gccinstall.info
 	dosym usr/include /usr/${CTARGET}/sys-include
 }