summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-05-17 18:53:40 +0000
committerMike Frysinger <vapier@gentoo.org>2007-05-17 18:53:40 +0000
commit704a1fbe7ed0e273f297f4edf659c0400eff4490 (patch)
tree4852529288407f670917e78b3e5aa28e7b8b6d4f /sys-libs
parentNew upstream version. Ebuild clean-up. Pruned old version. (diff)
downloadhistorical-704a1fbe7ed0e273f297f4edf659c0400eff4490.tar.gz
historical-704a1fbe7ed0e273f297f4edf659c0400eff4490.tar.bz2
historical-704a1fbe7ed0e273f297f4edf659c0400eff4490.zip
as pointed out by kanaka, dont run simple tests for cross-compilers
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/Manifest14
-rw-r--r--sys-libs/glibc/glibc-2.5-r2.ebuild5
2 files changed, 10 insertions, 9 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 0f0f794dbf11..97807c8f847d 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -514,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 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-r2.ebuild 38672 RMD160 1e0687f9d06e9cffa1f164da506dc39fa1c50884 SHA1 517f47df251dde0d314983ab59a0f0fc4dec61c0 SHA256 d6373897b88ffbe287eba8f0996ef4befef8228fd54f3352517628d4bbda2ce0
+MD5 4aa41136c38f06064ad48b2aa33641bf glibc-2.5-r2.ebuild 38672
+RMD160 1e0687f9d06e9cffa1f164da506dc39fa1c50884 glibc-2.5-r2.ebuild 38672
+SHA256 d6373897b88ffbe287eba8f0996ef4befef8228fd54f3352517628d4bbda2ce0 glibc-2.5-r2.ebuild 38672
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
@@ -563,7 +563,7 @@ SHA256 bf7dd47ded105b17eff75fa0be15cec59e3fdb1809fb541f9ff492ea3e0d50aa files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.3 (GNU/Linux)
-iD8DBQFGSwpQ8bi6rjpTunYRAmwvAJ4p06XoQCwXJYaAi5bpcjfUocwtngCgkpFV
-f8Q55L29oBqPjLCL2Q+6LkE=
-=L1zY
+iD8DBQFGTKS38bi6rjpTunYRAn+dAKDXSZiFjy6O+H8UflxzonWw2OnfaQCfa568
+/NhwxhEZL8QmAujup0sW9bQ=
+=ZPWs
-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.5-r2.ebuild b/sys-libs/glibc/glibc-2.5-r2.ebuild
index b1f12de9838e..848620390e1f 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.13 2007/05/16 13:41:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5-r2.ebuild,v 1.14 2007/05/17 18:53:40 vapier Exp $
# Here's how the cross-compile logic breaks down ...
# CTARGET - machine that will target the binaries
@@ -331,8 +331,9 @@ toolchain-glibc_pkg_preinst() {
# 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.
+ # they will fail. also, skip if this glibc is a cross compiler.
[[ ${ROOT} != "/" ]] && return 0
+ is_crosscompile && return 0
local x striptest
for x in date env ls true uname ; do
x=$(type -p ${x})