diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-22 08:06:30 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-22 08:06:30 +0000 |
| commit | a4a77a4db0bf661f4aee718aaf09bc7536b5f6e5 (patch) | |
| tree | 0442b13036781906218d642fda2078b4b3910fde | |
| parent | Version bumped. (diff) | |
| download | gentoo-2-a4a77a4db0bf661f4aee718aaf09bc7536b5f6e5.tar.gz gentoo-2-a4a77a4db0bf661f4aee718aaf09bc7536b5f6e5.tar.bz2 gentoo-2-a4a77a4db0bf661f4aee718aaf09bc7536b5f6e5.zip | |
Set correct path for libpcre.a
(Portage version: 2.0.51.19)
| -rw-r--r-- | sys-apps/grep/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/grep/grep-2.5.1-r6.ebuild | 6 | ||||
| -rw-r--r-- | sys-apps/grep/grep-2.5.1-r7.ebuild | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog index f47538ca238a..419ac1389d0f 100644 --- a/sys-apps/grep/ChangeLog +++ b/sys-apps/grep/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/grep # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.43 2005/02/20 01:32:30 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.44 2005/03/22 08:06:30 eradicator Exp $ + + 22 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org> + grep-2.5.1-r6.ebuild, grep-2.5.1-r7.ebuild: + Set correct path for libpcre.a 19 Feb 2005; <solar@gentoo.org> grep-2.5.1-r7.ebuild: - bug 76879 broke maketest on uClibc hosts. for now make the patching diff --git a/sys-apps/grep/grep-2.5.1-r6.ebuild b/sys-apps/grep/grep-2.5.1-r6.ebuild index f99b0763ab7c..e4ada887a143 100644 --- a/sys-apps/grep/grep-2.5.1-r6.ebuild +++ b/sys-apps/grep/grep-2.5.1-r6.ebuild @@ -1,8 +1,8 @@ # 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-r6.ebuild,v 1.12 2005/02/18 03:56:50 kito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r6.ebuild,v 1.13 2005/03/22 08:06:30 eradicator Exp $ -inherit gnuconfig flag-o-matic eutils +inherit gnuconfig flag-o-matic eutils multilib DESCRIPTION="GNU regular expression matcher" HOMEPAGE="http://www.gnu.org/software/grep/grep.html" @@ -63,7 +63,7 @@ src_compile() { econf ${myconf} || die "econf failed" if use pcre && ! use uclibc ; then - sed -i -e 's:-lpcre:/usr/lib/libpcre.a:g' {lib,src}/Makefile \ + sed -i -e "s:-lpcre:/usr/$(get_libdir)/libpcre.a:g" {lib,src}/Makefile \ || die "sed Makefile failed" fi diff --git a/sys-apps/grep/grep-2.5.1-r7.ebuild b/sys-apps/grep/grep-2.5.1-r7.ebuild index 7efd5311ff2e..4d1c0bfcdeb8 100644 --- a/sys-apps/grep/grep-2.5.1-r7.ebuild +++ b/sys-apps/grep/grep-2.5.1-r7.ebuild @@ -1,8 +1,8 @@ # 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.3 2005/02/25 04:44:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r7.ebuild,v 1.4 2005/03/22 08:06:30 eradicator Exp $ -inherit flag-o-matic eutils +inherit flag-o-matic eutils multilib DESCRIPTION="GNU regular expression matcher" HOMEPAGE="http://www.gnu.org/software/grep/grep.html" @@ -58,7 +58,7 @@ src_compile() { if use pcre && ! use uclibc ; then sed -i \ - -e 's:-lpcre:/usr/lib/libpcre.a:g' \ + -e "s:-lpcre:/usr/$(get_libdir)/libpcre.a:g" \ {lib,src}/Makefile \ || die "sed Makefile failed" fi |