diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2009-04-12 11:03:12 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2009-04-12 11:03:12 +0000 |
| commit | 5a6bd99b70f917e677cfa3237a1c7f4b3cafe950 (patch) | |
| tree | 891b0e203c67632828f1cee0faf3d09fd802c5d1 | |
| parent | Stable on alpha, bug #265376 (diff) | |
| download | gentoo-2-5a6bd99b70f917e677cfa3237a1c7f4b3cafe950.tar.gz gentoo-2-5a6bd99b70f917e677cfa3237a1c7f4b3cafe950.tar.bz2 gentoo-2-5a6bd99b70f917e677cfa3237a1c7f4b3cafe950.zip | |
Use gen_usr_ldscript instead of clunky symlinks handling. Thanks to grobian.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
| -rw-r--r-- | dev-libs/libpcre/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/libpcre/libpcre-7.8-r1.ebuild | 6 | ||||
| -rw-r--r-- | dev-libs/libpcre/libpcre-7.9_rc2.ebuild | 8 |
3 files changed, 11 insertions, 10 deletions
diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog index 3cc409c0bce4..5ffb147e8f7a 100644 --- a/dev-libs/libpcre/ChangeLog +++ b/dev-libs/libpcre/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/libpcre # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.147 2009/04/09 16:08:21 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.148 2009/04/12 11:03:12 loki_val Exp $ + + 12 Apr 2009; Peter Alfredsen <loki_val@gentoo.org> libpcre-7.8-r1.ebuild, + libpcre-7.9_rc2.ebuild: + Use gen_usr_ldscript instead of clunky symlinks handling. Thanks to + grobian. *libpcre-7.9_rc2 (09 Apr 2009) *libpcre-7.8-r1 (09 Apr 2009) diff --git a/dev-libs/libpcre/libpcre-7.8-r1.ebuild b/dev-libs/libpcre/libpcre-7.8-r1.ebuild index 901ded619ef5..e4af897a64f7 100644 --- a/dev-libs/libpcre/libpcre-7.8-r1.ebuild +++ b/dev-libs/libpcre/libpcre-7.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.8-r1.ebuild,v 1.2 2009/04/10 15:52:19 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.8-r1.ebuild,v 1.3 2009/04/12 11:03:12 loki_val Exp $ EAPI=2 @@ -49,9 +49,7 @@ src_configure() { src_install() { emake DESTDIR="${D}" install || die "make install failed" - dodir /$(get_libdir) - mv "${D}"/usr/$(get_libdir)/libpcre.so* "${D}"/$(get_libdir)/ || die "moving libpcre failed" - dosym ../../$(get_libdir)/$(readlink "${D}"/$(get_libdir)/libpcre.so) /usr/$(get_libdir)/libpcre.so || die "Creating symlink failed" + gen_usr_ldscript -a pcre dodoc doc/*.txt AUTHORS use doc && dohtml doc/html/* diff --git a/dev-libs/libpcre/libpcre-7.9_rc2.ebuild b/dev-libs/libpcre/libpcre-7.9_rc2.ebuild index fb1928661707..a9ff10d15576 100644 --- a/dev-libs/libpcre/libpcre-7.9_rc2.ebuild +++ b/dev-libs/libpcre/libpcre-7.9_rc2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.9_rc2.ebuild,v 1.2 2009/04/10 15:52:19 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.9_rc2.ebuild,v 1.3 2009/04/12 11:03:12 loki_val Exp $ EAPI=2 -inherit libtool eutils +inherit libtool eutils toolchain-funcs DESCRIPTION="Perl-compatible regular expression library" HOMEPAGE="http://www.pcre.org/" @@ -49,9 +49,7 @@ src_configure() { src_install() { emake DESTDIR="${D}" install || die "make install failed" - dodir /$(get_libdir) - mv "${D}"/usr/$(get_libdir)/libpcre.so* "${D}"/$(get_libdir)/ || die "moving libpcre failed" - dosym ../../$(get_libdir)/$(readlink "${D}"/$(get_libdir)/libpcre.so) /usr/$(get_libdir)/libpcre.so || die "Creating symlink failed" + gen_usr_ldscript -a pcre dodoc doc/*.txt AUTHORS use doc && dohtml doc/html/* |