diff options
| author |   Javier Villavicencio <the_paya@gentoo.org> | 2008-12-31 16:35:44 +0000 |
|---|---|---|
| committer | Javier Villavicencio <the_paya@gentoo.org> | 2008-12-31 16:35:44 +0000 |
| commit | 996e0a5be08d38253d36f0662e1faba9bdcba3d7 (patch) | |
| tree | 352fc05bd8d9ee4cf8bb34d72b17ba8e2bf0ef5e /sys-apps/grep | |
| parent | Stable on sparc, bug #252669 (diff) | |
| download | gentoo-2-996e0a5be08d38253d36f0662e1faba9bdcba3d7.tar.gz gentoo-2-996e0a5be08d38253d36f0662e1faba9bdcba3d7.tar.bz2 gentoo-2-996e0a5be08d38253d36f0662e1faba9bdcba3d7.zip | |
Fix for bug 238475.
(Portage version: 2.2_rc20/cvs/FreeBSD 7.0-RELEASE i386)
Diffstat (limited to 'sys-apps/grep')
| -rw-r--r-- | sys-apps/grep/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/grep/files/grep-2.5.3-po-builddir-fix.patch | 10 | ||||
| -rw-r--r-- | sys-apps/grep/grep-2.5.3-r1.ebuild | 5 |
3 files changed, 18 insertions, 3 deletions
diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog index 2ddcd8fc1899..94c5e63c216c 100644 --- a/sys-apps/grep/ChangeLog +++ b/sys-apps/grep/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/grep # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.78 2008/10/07 09:39:19 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.79 2008/12/31 16:35:44 the_paya Exp $ + + 31 Dec 2008; Javier Villavicencio <the_paya@gentoo.org> + +files/grep-2.5.3-po-builddir-fix.patch, grep-2.5.3-r1.ebuild: + Fix for bug 238475. 07 Oct 2008; Peter Alfredsen <loki_val@gentoo.org> +files/grep-2.5.3-yesno-test-fix.patch, grep-2.5.3-r1.ebuild: diff --git a/sys-apps/grep/files/grep-2.5.3-po-builddir-fix.patch b/sys-apps/grep/files/grep-2.5.3-po-builddir-fix.patch new file mode 100644 index 000000000000..7d3e334f37b5 --- /dev/null +++ b/sys-apps/grep/files/grep-2.5.3-po-builddir-fix.patch @@ -0,0 +1,10 @@ +--- grep-2.5.3/po/Makefile.in.in.orig 2006-11-24 20:53:21 -0300 ++++ grep-2.5.3/po/Makefile.in.in 2008-10-26 18:31:06 -0200 +@@ -13,6 +13,7 @@ + @SET_MAKE@ + + srcdir = @srcdir@ ++top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + diff --git a/sys-apps/grep/grep-2.5.3-r1.ebuild b/sys-apps/grep/grep-2.5.3-r1.ebuild index c5a5b99d282f..5a3508b58086 100644 --- a/sys-apps/grep/grep-2.5.3-r1.ebuild +++ b/sys-apps/grep/grep-2.5.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.3-r1.ebuild,v 1.2 2008/10/07 09:39:19 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.3-r1.ebuild,v 1.3 2008/12/31 16:35:44 the_paya Exp $ inherit flag-o-matic eutils @@ -31,6 +31,7 @@ src_unpack() { EPATCH_MULTI_MSG="Applying Debian patchset (${DEB_VER}) ..." \ epatch ${P}~dfsg/debian/patches/ epatch "${FILESDIR}"/${P}-yesno-test-fix.patch + epatch "${FILESDIR}"/${P}-po-builddir-fix.patch use static && append-ldflags -static } @@ -39,7 +40,7 @@ src_compile() { --bindir=/bin \ $(use_enable nls) \ $(use_enable pcre perl-regexp) \ - --without-included-regex \ + $(use elibc_FreeBSD || echo --without-included-regex) \ || die "econf failed" use static || sed -i 's:-lpcre:-Wl,-Bstatic -lpcre -Wl,-Bdynamic:g' src/Makefile |