diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-04-14 02:23:25 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-04-14 02:23:25 +0000 |
| commit | a4bca7575f2e38e7e16d81f47bdbca340986618d (patch) | |
| tree | 71becd29cb53c642a9a4c11ffe0677d0d5e9fa76 /sys-libs | |
| parent | rewrite ELT_walk_patches to handle path name as well as locale issues pointed... (diff) | |
| download | gentoo-2-a4bca7575f2e38e7e16d81f47bdbca340986618d.tar.gz gentoo-2-a4bca7575f2e38e7e16d81f47bdbca340986618d.tar.bz2 gentoo-2-a4bca7575f2e38e7e16d81f47bdbca340986618d.zip | |
Tweak the sed on configure tests to cover more cases #310573 by Jan-Erik Skata.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/zlib/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/zlib/zlib-1.2.4.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog index 05d054146786..c5e341c2cd7f 100644 --- a/sys-libs/zlib/ChangeLog +++ b/sys-libs/zlib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/zlib # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.75 2010/03/20 18:21:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.76 2010/04/14 02:23:25 vapier Exp $ + + 14 Apr 2010; Mike Frysinger <vapier@gentoo.org> zlib-1.2.4.ebuild: + Tweak the sed on configure tests to cover more cases #310573 by Jan-Erik + Skata. 20 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> files/zlib-1.2.4-configure-LANG.patch: diff --git a/sys-libs/zlib/zlib-1.2.4.ebuild b/sys-libs/zlib/zlib-1.2.4.ebuild index aa4e579c4692..5bb9ea1f7beb 100644 --- a/sys-libs/zlib/zlib-1.2.4.ebuild +++ b/sys-libs/zlib/zlib-1.2.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.4.ebuild,v 1.3 2010/03/19 19:09:37 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.4.ebuild,v 1.4 2010/04/14 02:23:25 vapier Exp $ inherit eutils toolchain-funcs @@ -27,7 +27,7 @@ src_unpack() { # trust exit status of the compiler rather than stderr #55434 # -if test "`(...) 2>&1`" = ""; then # +if (...) 2>/dev/null; then - sed -i 's|if test "`\(.*\) 2>&1`" = ""; then|if \1 2>/dev/null; then|' configure || die + sed -i 's|\<test "`\([^"]*\) 2>&1`" = ""|\1 2>/dev/null|' configure || die sed -i -e '/ldconfig/d' Makefile* || die } |