| 1 |
vapier 14/01/31 08:22:32 |
| 2 |
|
| 3 |
Modified: apache-tools-2.4.7-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix cross-compiling handling of pkg-config/pcre-config/apr/apr-util #385779 by Bertrand Jacquin. |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-admin/apache-tools/apache-tools-2.4.7-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7-r1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7-r1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7-r1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: apache-tools-2.4.7-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7-r1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- apache-tools-2.4.7-r1.ebuild 31 Jan 2014 08:19:52 -0000 1.1 |
| 23 |
+++ apache-tools-2.4.7-r1.ebuild 31 Jan 2014 08:22:32 -0000 1.2 |
| 24 |
@@ -1,9 +1,9 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7-r1.ebuild,v 1.1 2014/01/31 08:19:52 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7-r1.ebuild,v 1.2 2014/01/31 08:22:32 vapier Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
-inherit flag-o-matic eutils multilib |
| 32 |
+inherit flag-o-matic eutils multilib toolchain-funcs |
| 33 |
|
| 34 |
DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm" |
| 35 |
HOMEPAGE="http://httpd.apache.org/" |
| 36 |
@@ -27,6 +27,14 @@ |
| 37 |
|
| 38 |
src_prepare() { |
| 39 |
epatch "${FILESDIR}"/${PN}-2.4.7-Makefile.patch #459446 |
| 40 |
+ |
| 41 |
+ # This package really should upgrade to using pcre's .pc file. |
| 42 |
+ cat <<-\EOF >"${T}"/pcre-config |
| 43 |
+ #!/bin/sh |
| 44 |
+ [ "${flag}" = "--version" ] && set -- --modversion |
| 45 |
+ exec ${PKG_CONFIG} libpcre "$@" |
| 46 |
+ EOF |
| 47 |
+ chmod a+x "${T}"/pcre-config |
| 48 |
} |
| 49 |
|
| 50 |
src_configure() { |
| 51 |
@@ -35,6 +43,8 @@ |
| 52 |
# Brain dead check. |
| 53 |
tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" |
| 54 |
|
| 55 |
+ tc-export PKG_CONFIG |
| 56 |
+ |
| 57 |
# Instead of filtering --as-needed (bug #128505), append --no-as-needed |
| 58 |
append-ldflags $(no-as-needed) |
| 59 |
|
| 60 |
@@ -42,16 +52,20 @@ |
| 61 |
|
| 62 |
# econf overwrites the stuff from config.layout, so we have to put them into |
| 63 |
# our myconf line too |
| 64 |
+ ac_cv_path_PKGCONFIG=${PKG_CONFIG} \ |
| 65 |
econf \ |
| 66 |
--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \ |
| 67 |
--sbindir="${EPREFIX}"/usr/sbin \ |
| 68 |
--with-perl="${EPREFIX}"/usr/bin/perl \ |
| 69 |
--with-expat="${EPREFIX}"/usr \ |
| 70 |
--with-z="${EPREFIX}"/usr \ |
| 71 |
- --with-apr="${EPREFIX}"/usr \ |
| 72 |
- --with-apr-util="${EPREFIX}"/usr \ |
| 73 |
- --with-pcre="${EPREFIX}"/usr \ |
| 74 |
+ --with-apr="${SYSROOT}${EPREFIX}"/usr \ |
| 75 |
+ --with-apr-util="${SYSROOT}${EPREFIX}"/usr \ |
| 76 |
+ --with-pcre="${T}"/pcre-config \ |
| 77 |
"${myconf[@]}" |
| 78 |
+ sed -i \ |
| 79 |
+ -e '/^LTFLAGS/s:--silent::' \ |
| 80 |
+ build/rules.mk build/config_vars.mk || die |
| 81 |
} |
| 82 |
|
| 83 |
src_compile() { |
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
1.176 app-admin/apache-tools/ChangeLog |
| 88 |
|
| 89 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/ChangeLog?rev=1.176&view=markup |
| 90 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/ChangeLog?rev=1.176&content-type=text/plain |
| 91 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/ChangeLog?r1=1.175&r2=1.176 |
| 92 |
|
| 93 |
Index: ChangeLog |
| 94 |
=================================================================== |
| 95 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v |
| 96 |
retrieving revision 1.175 |
| 97 |
retrieving revision 1.176 |
| 98 |
diff -u -r1.175 -r1.176 |
| 99 |
--- ChangeLog 31 Jan 2014 08:19:52 -0000 1.175 |
| 100 |
+++ ChangeLog 31 Jan 2014 08:22:32 -0000 1.176 |
| 101 |
@@ -1,6 +1,10 @@ |
| 102 |
# ChangeLog for app-admin/apache-tools |
| 103 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 104 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.175 2014/01/31 08:19:52 vapier Exp $ |
| 105 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.176 2014/01/31 08:22:32 vapier Exp $ |
| 106 |
+ |
| 107 |
+ 31 Jan 2014; Mike Frysinger <vapier@g.o> apache-tools-2.4.7-r1.ebuild: |
| 108 |
+ Fix cross-compiling handling of pkg-config/pcre-config/apr/apr-util #385779 by |
| 109 |
+ Bertrand Jacquin. |
| 110 |
|
| 111 |
*apache-tools-2.4.7-r1 (31 Jan 2014) |
Archives