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 | 51cb29362ccc87217bdf8b6f6cc0a31f6d308ec9 (patch) | |
| tree | 8bb8e6da81c7f38f986ba1072cdd59675d98505f | |
| parent | Masking qbittorrent beta releases (diff) | |
| download | historical-51cb29362ccc87217bdf8b6f6cc0a31f6d308ec9.tar.gz historical-51cb29362ccc87217bdf8b6f6cc0a31f6d308ec9.tar.bz2 historical-51cb29362ccc87217bdf8b6f6cc0a31f6d308ec9.zip | |
Properly fix build failure (bug #317527).
Package-Manager: portage-HEAD/cvs/Linux x86_64
| -rw-r--r-- | dev-libs/apr/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/apr/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/apr/apr-1.4.2.ebuild | 9 |
3 files changed, 12 insertions, 7 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/Manifest b/dev-libs/apr/Manifest index 5bd20863c763..10a3042831aa 100644 --- a/dev-libs/apr/Manifest +++ b/dev-libs/apr/Manifest @@ -2,6 +2,6 @@ AUX config.layout.patch 818 RMD160 dada232c8b85e6c3c62fbc6caa1d05f36164dc27 SHA1 DIST apr-1.3.9.tar.bz2 927657 RMD160 e90943275289113771b623c827ab3fb3c18064d8 SHA1 fb19ec11a15db03dcb9211f31012b079a522d1f0 SHA256 5705a393f48ce8652e2b9143668ed208d34e7ce702b28dd497353561a6ed2ce2 DIST apr-1.4.2.tar.bz2 766793 RMD160 20d4ae082d490432710aad1c4f689e6032a6c921 SHA1 b3ed66c2e7f67c50ae33b5cd85e9f46a93c6e4f8 SHA256 2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391 EBUILD apr-1.3.9.ebuild 1879 RMD160 c2cf42299838497fc55aa3d31a26fb0d382543a9 SHA1 44fd7b97f2b94cc312e19314ea7c263fa35e8814 SHA256 3682a05d20cce1c1d9dc8d83d118df13d0c7cf7ce24d5b62542418ebb0a90eaf -EBUILD apr-1.4.2.ebuild 1894 RMD160 1ddcd277ae2d39bcbc4d433b800eb151608077b1 SHA1 83973e73c469cddc2d935b21f7b67cf0fd1121cb SHA256 2954982fb0d40aa5af358fbafb73e2b34ab7ccd5a110f7debd1a5489bca73c4d -MISC ChangeLog 18862 RMD160 7f4723b7e5855c243568a1ab6fd6be9834aaf784 SHA1 d6ece924d113f8ec06d89603cc35262271f6d52c SHA256 e02a1be28eb6a98a2b6c4675804c4f88bc42af7ebb7aa1704dd9ad2cae5ca9b3 +EBUILD apr-1.4.2.ebuild 1940 RMD160 e493a1bf18c8316e6c023e24b1505b16cc8413c5 SHA1 0de51edf629766a56c36e4f31caa81ddfea03c93 SHA256 ff29e56157ca7dee21c4c60a41cc3002eff89679764aec1ff7ae7eafa1d4833a +MISC ChangeLog 19001 RMD160 bd7066a3e1f14c5258def76a91f3e0866246fece SHA1 2f0a9b8a07c4abe2f0b9b3d797aff49db230fc07 SHA256 c14e2ed020f4fc23711d15d91d5c44fbe1fe222495157a31c2d1a2efc4839e5e MISC metadata.xml 406 RMD160 9af45dec0119ed9afc091ef98d47a4dd7fcec2ae SHA1 d16a3b4f5efbf383b034e83f298a6d86ac9fd878 SHA256 bef219a00636140b1d99834ae19afc00b89f4df68068d1937a53c2c8ce51f2b9 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 } |