| 1 |
arfrever 10/06/02 14:22:28 |
| 2 |
|
| 3 |
Modified: ChangeLog apr-1.4.2.ebuild |
| 4 |
Log: |
| 5 |
Properly fix build failure (bug #317527). |
| 6 |
(Portage version: HEAD/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.157 dev-libs/apr/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/ChangeLog?rev=1.157&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/ChangeLog?rev=1.157&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/ChangeLog?r1=1.156&r2=1.157 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v |
| 18 |
retrieving revision 1.156 |
| 19 |
retrieving revision 1.157 |
| 20 |
diff -u -r1.156 -r1.157 |
| 21 |
--- ChangeLog 2 Jun 2010 12:23:31 -0000 1.156 |
| 22 |
+++ ChangeLog 2 Jun 2010 14:22:27 -0000 1.157 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-libs/apr |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.156 2010/06/02 12:23:31 patrick Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.157 2010/06/02 14:22:27 arfrever Exp $ |
| 28 |
+ |
| 29 |
+ 02 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
| 30 |
+ apr-1.4.2.ebuild: |
| 31 |
+ Properly fix build failure (bug #317527). |
| 32 |
|
| 33 |
02 Jun 2010; Patrick Lauer <patrick@g.o> apr-1.4.2.ebuild: |
| 34 |
Fix for compilation failure, #317527. Thanks to Andrew Savchenko for the |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 dev-libs/apr/apr-1.4.2.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/apr-1.4.2.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/apr-1.4.2.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/apr-1.4.2.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: apr-1.4.2.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.2.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- apr-1.4.2.ebuild 2 Jun 2010 12:23:31 -0000 1.2 |
| 51 |
+++ apr-1.4.2.ebuild 2 Jun 2010 14:22:27 -0000 1.3 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.2.ebuild,v 1.2 2010/06/02 12:23:31 patrick Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.2.ebuild,v 1.3 2010/06/02 14:22:27 arfrever Exp $ |
| 57 |
|
| 58 |
EAPI="2" |
| 59 |
|
| 60 |
@@ -20,6 +20,10 @@ |
| 61 |
RDEPEND="" |
| 62 |
|
| 63 |
src_prepare() { |
| 64 |
+ # Ensure that system libtool is used. |
| 65 |
+ sed -e 's:${installbuilddir}/libtool:/usr/bin/libtool:' -i apr-config.in || die "sed failed" |
| 66 |
+ sed -e 's:@LIBTOOL@:$(SHELL) /usr/bin/libtool:' -i build/apr_rules.mk.in || die "sed failed" |
| 67 |
+ |
| 68 |
AT_M4DIR="build" eautoreconf |
| 69 |
elibtoolize |
| 70 |
|
| 71 |
@@ -48,9 +52,6 @@ |
| 72 |
--enable-threads \ |
| 73 |
${myconf} |
| 74 |
|
| 75 |
- # Make sure we use the system libtool. |
| 76 |
- sed -i 's,$(top_builddir)/libtool,/usr/bin/libtool,' build/apr_rules.mk |
| 77 |
- sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' apr-1-config |
| 78 |
rm -f libtool |
| 79 |
} |
Archives