diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-05-24 23:12:51 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-05-24 23:12:51 +0000 |
| commit | d3706b19ee3348cc10f97b1685fd202aa5115f01 (patch) | |
| tree | f04c439aa93c4b9615b2a02429ab07557e09e249 /sys-apps/grep | |
| parent | disable emacs if USE=-emacs #93823 (diff) | |
| download | historical-d3706b19ee3348cc10f97b1685fd202aa5115f01.tar.gz historical-d3706b19ee3348cc10f97b1685fd202aa5115f01.tar.bz2 historical-d3706b19ee3348cc10f97b1685fd202aa5115f01.zip | |
fix static linking with libpcre
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'sys-apps/grep')
| -rw-r--r-- | sys-apps/grep/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/grep/grep-2.5.1-r7.ebuild | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest index 2486100879ee..9ea1e597c583 100644 --- a/sys-apps/grep/Manifest +++ b/sys-apps/grep/Manifest @@ -1,7 +1,7 @@ MD5 537532d9f88524b15e36bafbb2cef058 ChangeLog 6939 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 10af40019a596a9b25064ed2a971ee87 grep-2.5.1-r6.ebuild 2234 -MD5 f5093450433eafd99344df1acf563ef3 grep-2.5.1-r7.ebuild 1986 +MD5 6eedab3899a3e89f95a4bee30ae54c36 grep-2.5.1-r7.ebuild 1992 MD5 41f77ef6693dc91a37b5ec51ce5a3e2d files/2.5.1-manpage.patch 283 MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r7 62 MD5 b43c763953a7b7d3345fc0dd625f299c files/grep-2.5.1-fgrep.patch.bz2 1678 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" } |