diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-06-02 14:22:27 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-06-02 14:22:27 +0000 |
| commit | 932427bdae9ab2a062cb913b73079ee370254853 (patch) | |
| tree | 3dea412adf5dbe47ce6c5ee0db6a2bd807b7f46f /dev-libs/apr | |
| parent | Masking qbittorrent beta releases (diff) | |
| download | gentoo-2-932427bdae9ab2a062cb913b73079ee370254853.tar.gz gentoo-2-932427bdae9ab2a062cb913b73079ee370254853.tar.bz2 gentoo-2-932427bdae9ab2a062cb913b73079ee370254853.zip | |
Properly fix build failure (bug #317527).
(Portage version: HEAD/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/apr')
| -rw-r--r-- | dev-libs/apr/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/apr/apr-1.4.2.ebuild | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog index 5d1b08cddbed..81f3cdf31a1d 100644 --- a/dev-libs/apr/ChangeLog +++ b/dev-libs/apr/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/apr # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.156 2010/06/02 12:23:31 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.157 2010/06/02 14:22:27 arfrever Exp $ + + 02 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + apr-1.4.2.ebuild: + Properly fix build failure (bug #317527). 02 Jun 2010; Patrick Lauer <patrick@gentoo.org> apr-1.4.2.ebuild: Fix for compilation failure, #317527. Thanks to Andrew Savchenko for the diff --git a/dev-libs/apr/apr-1.4.2.ebuild b/dev-libs/apr/apr-1.4.2.ebuild index 2d7f80192110..67204aa54d5f 100644 --- a/dev-libs/apr/apr-1.4.2.ebuild +++ b/dev-libs/apr/apr-1.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.2.ebuild,v 1.2 2010/06/02 12:23:31 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.2.ebuild,v 1.3 2010/06/02 14:22:27 arfrever Exp $ EAPI="2" @@ -20,6 +20,10 @@ DEPEND="doc? ( app-doc/doxygen )" RDEPEND="" src_prepare() { + # Ensure that system libtool is used. + sed -e 's:${installbuilddir}/libtool:/usr/bin/libtool:' -i apr-config.in || die "sed failed" + sed -e 's:@LIBTOOL@:$(SHELL) /usr/bin/libtool:' -i build/apr_rules.mk.in || die "sed failed" + AT_M4DIR="build" eautoreconf elibtoolize @@ -48,9 +52,6 @@ src_configure() { --enable-threads \ ${myconf} - # Make sure we use the system libtool. - sed -i 's,$(top_builddir)/libtool,/usr/bin/libtool,' build/apr_rules.mk - sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' apr-1-config rm -f libtool } |