summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-05-24 23:12:51 +0000
committerMike Frysinger <vapier@gentoo.org>2005-05-24 23:12:51 +0000
commit02684ef6d54df96be3be95fc9be8ec573d6344d4 (patch)
tree0a4cf826a7d816b6215f138f4e691ff8fed7adab /sys-apps/grep
parentdisable emacs if USE=-emacs #93823 (diff)
downloadgentoo-2-02684ef6d54df96be3be95fc9be8ec573d6344d4.tar.gz
gentoo-2-02684ef6d54df96be3be95fc9be8ec573d6344d4.tar.bz2
gentoo-2-02684ef6d54df96be3be95fc9be8ec573d6344d4.zip
fix static linking with libpcre
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'sys-apps/grep')
-rw-r--r--sys-apps/grep/grep-2.5.1-r7.ebuild13
1 files changed, 7 insertions, 6 deletions
diff --git a/sys-apps/grep/grep-2.5.1-r7.ebuild b/sys-apps/grep/grep-2.5.1-r7.ebuild
index f91da4125384..0de1943271c9 100644
--- a/sys-apps/grep/grep-2.5.1-r7.ebuild
+++ b/sys-apps/grep/grep-2.5.1-r7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 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-r7.ebuild,v 1.6 2005/05/24 02:38:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r7.ebuild,v 1.7 2005/05/24 23:12:51 vapier Exp $
inherit flag-o-matic eutils
@@ -35,11 +35,6 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-restrict_arr.patch
epatch "${FILESDIR}"/${PV}-utf8-case.patch
- # force static linking so we dont have to move it into /
- sed -i \
- -e 's:-lpcre:-Wl,-Bstatic -lpcre -Wl,-Bdynamic:g' \
- configure || die "sed configure failed"
-
# uclibc does not suffer from this glibc bug.
use uclibc || epatch "${FILESDIR}"/${PV}-tests.patch
}
@@ -55,6 +50,12 @@ src_compile() {
$(use_enable nls) \
$(use_enable pcre perl-regexp) \
|| die "econf failed"
+
+ # force static linking so we dont have to move it into /
+ sed -i \
+ -e 's:-lpcre:-Wl,-Bstatic -lpcre -Wl,-Bdynamic:g' \
+ src/Makefile || die "sed static pcre failed"
+
emake || die "emake failed"
}