diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-01-05 06:06:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-01-05 06:06:15 +0000 |
| commit | d6be78e64bed265c855538c7f9f9af461874c6a2 (patch) | |
| tree | 9651d9a01c8d3d135ef848f51dc852f9b1af5a88 /sys-apps/grep | |
| parent | turn off -O to prevent segfault in reponse to bug #113627 (diff) | |
| download | gentoo-2-d6be78e64bed265c855538c7f9f9af461874c6a2.tar.gz gentoo-2-d6be78e64bed265c855538c7f9f9af461874c6a2.tar.bz2 gentoo-2-d6be78e64bed265c855538c7f9f9af461874c6a2.zip | |
And add back in USE=pcre, but do it safely.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'sys-apps/grep')
| -rw-r--r-- | sys-apps/grep/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/grep/grep-2.5.1-r9.ebuild | 18 |
2 files changed, 19 insertions, 6 deletions
diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog index d5694fec8638..ecc6dec22336 100644 --- a/sys-apps/grep/ChangeLog +++ b/sys-apps/grep/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/grep -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.56 2005/12/24 05:15:43 vapier Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.57 2006/01/05 06:06:15 vapier Exp $ + + 05 Jan 2006; Mike Frysinger <vapier@gentoo.org> grep-2.5.1-r9.ebuild: + And add back in USE=pcre, but do it safely. 24 Dec 2005; Mike Frysinger <vapier@gentoo.org> grep-2.5.1-r8.ebuild, grep-2.5.1-r9.ebuild: diff --git a/sys-apps/grep/grep-2.5.1-r9.ebuild b/sys-apps/grep/grep-2.5.1-r9.ebuild index 2edf387d7a0f..7d190c7cb879 100644 --- a/sys-apps/grep/grep-2.5.1-r9.ebuild +++ b/sys-apps/grep/grep-2.5.1-r9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r9.ebuild,v 1.3 2005/12/24 05:15:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r9.ebuild,v 1.4 2006/01/05 06:06:15 vapier Exp $ inherit flag-o-matic eutils @@ -12,10 +12,11 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="build nls static" +IUSE="build nls pcre static" RDEPEND="" DEPEND="${RDEPEND} + pcre? ( dev-libs/libpcre ) nls? ( sys-devel/gettext )" src_unpack() { @@ -50,8 +51,17 @@ src_compile() { econf \ --bindir=/bin \ $(use_enable nls) \ - --disable-perl-regexp \ + $(use_enable pcre perl-regexp) \ || die "econf failed" + + if ! use static ; then + # XXX: UGLY HACK + # force static linking so we dont have to move libpcre into / + sed -i \ + -e 's:-lpcre:-Wl,-Bstatic -lpcre -Wl,-Bdynamic:g' \ + src/Makefile || die "sed static pcre failed" + fi + emake || die "emake failed" } |