Fix cross-compiling handling of pkg-config/pcre-config/apr/apr-util #385779 by Bertrand Jacquin.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 39 insertions, 21 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 3328cb491d7d..92c71f2ade15 100644
--- a/app-admin/apache-tools/ChangeLog
+++ b/app-admin/apache-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/apache-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.175 2014/01/31 08:19:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.176 2014/01/31 08:22:32 vapier Exp $
+
+  31 Jan 2014; Mike Frysinger <vapier@gentoo.org> apache-tools-2.4.7-r1.ebuild:
+  Fix cross-compiling handling of pkg-config/pcre-config/apr/apr-util #385779 by
+  Bertrand Jacquin.
 
 *apache-tools-2.4.7-r1 (31 Jan 2014)
 
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 12d831f4229e..4d5fe04fe2a7 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -14,24 +14,24 @@ EBUILD apache-tools-2.2.25.ebuild 2287 SHA256 d04ab4663f2a0d5686b25a72cf506801b0
 EBUILD apache-tools-2.2.26.ebuild 2297 SHA256 58f6067a2fae21683e161be94e591fc9227651cf882a439dee4f810e16d10885 SHA512 b5b921ee827546fe5aaffa434e042eba6888f2453fb518cdadb112a176b9cbcfffe61fb478b05e12c40080c31dfbee91dd09c6204e26a9ddf1ff08b276b4e19c WHIRLPOOL b9805363c3cf6c63626f4fe4f4a679d39dfce36e1690c32cb103765a2a9278d250fac15e30b2b94e3750dcde0be67fd59e4e810792d49ccd8fbe5b8cf35eb886
 EBUILD apache-tools-2.4.4-r1.ebuild 2233 SHA256 6cf5490575584de05cd088d9466eb70af371710b6632dd5c9edaa6a573dd2b64 SHA512 46f5b6381d5ee5d4121f358a890da30d18f64baeda71d73746c9cf92c825cdb2734f6fc0bfbdbfe34342df974f1ef3a1ad69b495a7cfcc4f5758af10e24bee32 WHIRLPOOL f4e36eb9ed5276670859e26f09ca2ea0e4dbe02c86cd5e362dfb70a7ec8643983d3aa71bab44f50710984db13a8df3efd4388e1bfb6d34b0c8051d49d17f2d05
 EBUILD apache-tools-2.4.6.ebuild 2242 SHA256 382fae36be53339b4f4f0f6730a3b5b274e02f95a4decbe517e987c14960947a SHA512 3e8937b81794546778d9e27b56f8be85174c473f82f62ab2e2e21714566c599bf078ed59d7c02a79155db8009b33e4b9e3cb4fb0d7aaa0bde652fe82dc9d0e19 WHIRLPOOL af12e163a8a1f66e7542faadcca6c06a0708ee80e4f9006d8b537e165caf663b0e7070ff225314435de3b9ad5f898183d22a0882399f42f26435e1bb1c3683af
-EBUILD apache-tools-2.4.7-r1.ebuild 2229 SHA256 9637c56e4f2f75e3351afebd555b39ecc8ab45c80448289fa40130d2ff007060 SHA512 caa27849b2f12cad631f24a5947953ee389102fdb9dd363c8897f25fd90610da80b52eb5e0294b819f738441bf6d4630588e22db208cc2952b351afa4429fcd7 WHIRLPOOL 5b48970e340642d38592b4405f86ca6396bf2c3b72bd95ea1af4c3596df15b958bb7423e8b4aec9a6de46e0f734fa185a525f433e0fb6d437f0bd933ffc6c3c8
+EBUILD apache-tools-2.4.7-r1.ebuild 2644 SHA256 dd72e6535774c5ad51e653e04f3aed71e38fab2a028396d025c2d5ff39c129d1 SHA512 071efa033fae1554da892b20eb2b884776f8987ef1207fa78fe0d233083f7a7fcb7cbc2935d86d0f18f93d6ffb7f6944bfd69170e881f9f63a21b8832979fe12 WHIRLPOOL ab708a7dd1bfe3d6a618938cea232546d40c1b0f7d90041fec369f9fd5c4e392ccb987966723f6cc8ddfa86bbf7ba01833fde9e1bc18e2cc4d25abea05fb07f1
 EBUILD apache-tools-2.4.7.ebuild 2149 SHA256 940937121dcdd2a6e2c78b0a07c08c8f4b097791766980d11824e3ae70a81511 SHA512 4ecfdf4f1729d03c954d5e529ec074685f1fd6e367dd4bde10e9e85ea1d7431b6c613c89574893e86dd0fa98a2473c6f5765f70f4afb8d18a3c3c839c5c2f547 WHIRLPOOL 33f015b69d14871d8501d809c347078d60d1c6b34b14b637eeaa4fbcdebd37aa351c2d60506d4959ab81f5120523d90900cbac7ceb0e74c278b37d06213fb2ff
-MISC ChangeLog 23268 SHA256 c94d1803aa990d59e30d71a627fef5d7941f3163cd3c7133c40c9b2619c6ef12 SHA512 2e484e93c8523f8b7816de759a92bb508939e150eb8b8af4b0986798c4ede059e22d164b84ede88842ef86c952b1d23f28ac7097eb093d01321b7ff8a9a0aef8 WHIRLPOOL 13fe8b11dfa904706b2c2393ec231d3c07d0b871e3b74d58b8a470f409a635d72e00395d5ad46f105697b4054d1c24d83c5deed84775f110f82db0bb13576006
+MISC ChangeLog 23450 SHA256 18f0ca9ff96643d0db4bcfbc0952dfb84be666de9af4bcb09b0772dd2eea7fe4 SHA512 05bd9dec6034bb121eaead2eac43edcab37cecd3614c37addd1dd076af7167b1ccd58a684b545b2d0c199e361131070c22bf89c0f43d5db833551a2b7cbcb979 WHIRLPOOL bd4fb2c333c4cc985d4cd8a705d61954e3ce5d339bf08d85a58b4e1259962c6be37fa38d50f58f5195609fa7489b40a510655d963513f3c2eee5bd83ae610738
 MISC metadata.xml 587 SHA256 7a663c163db27db13913e30a4936a622ffd9d0bb8718645e6267db0ff274c072 SHA512 9554e1963db41540801093b18efbfc1b85b2662ceef2b4e061065b4464a2de35212ae64257541261573d0c39c58a1e02d5da1b0fe139fede0aa9d9114a6fce7b WHIRLPOOL 14cf07a79457057ef8b2c97d663ce7d0ece8a7770c6fd60af1aaa9b4e187e0f823863629a991a0730c965407fae882f668756c7a68f3ad441ecb049a345d12eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS61ypAAoJEPGu1DbS6WIAfNgQAIkO7Fpf4AWQYzFVeQFIyhgm
-TOBwMBkKqHYHHQLtPh3yKZUrQzd1+QAC0Msidt0gq5CR5xEosHk/Q8fvY6kscFjf
-lzrO4fmH4akUIytN2zXiGJmav4rVHosD6gSkzMzlsEPrCuyoDSZkMcjhyNGXniwW
-xR9mb6SE2HLzRUh2ZPeyHvF0+Pyf7fsE8C1V/0+vAmHTtbtefmWf4Zgm11cbupQN
-g0gmCyLG0KdLGTsuAsxW0loOzn2a5Jc0JI7VbzRPhT3RGwMrFVNWIjntfvvt6wwe
-HCiLSVVsw3IiRJkUpmw4QKbe6Ubg/mGVTKjXTq83EX8SJAY/Zzftiks9jWWpD4pH
-wYlwIV2wOX9I61v3rb7jiuDVXl4a+PRVfB+rUnk8MPPytbOXt2O1ejvdWZ3stG7T
-frBBIkVnEmgdykYBoeMFinfgmRhB/fxlgyUGsdMSKoPRgXQR2nsEWyZx8+U9Chco
-IxUoilu5e3qcH1d/C5/44WuldLLsAUcyan3Km9SuLE7J1pawJgkhBWNTLi41dsZI
-z0dwF+43J82IcmFhbPtTgTD5K2jc+uL12BAIqFbmHTdbrozOORgRRmzWoFvTPvNu
-Xm/Jca/SAuKaeIEYu9VZySqcwwqg+8dtGwB4InDYK1+luEyR5NbC3TVmU8FjTUAi
-iAKapVCQJ2+xpfmDNdr2
-=JbEM
+iQIcBAEBCAAGBQJS611JAAoJEPGu1DbS6WIARiAP/1UL6XR6V///nxW+GVSmGCzD
+YBWhYItobq6g0cd1UNpOjcdrK1AgGQzqRuvk5H4xNk19n+uOvuxxutU5WSmErgBp
+c3ndt9UQNWF6vL+R0UK6nR5p2hiGSy8739VpVwWqBqekEvLXEIBGmGvZBGZBrYlF
+S1cJ2NxLNAMQV9l8RIO/XZgD6kND0Ie1kXXTxppIE/fFxeLsS7T9E7D7+BrvvKbn
+Bn7uuRwFTcjnN8AzhZJTypaqxtW1qQaWZEaenbsGIF4tgad6jnfqlxWxNHzUpkvK
+uQVSoPaUAru/0rffGn6/25RqDeEc2aw4edRoHuY+EFOc3m5h49wEXavBkgTMY1b9
+aD1G3KpwwIJWunLVfyl3QJCdTVxaNy55XcX8fGZqzCHhJbuxT+69/IeVfyt+yzHS
+CVZ/SMWXbC7tWdACtfjQU6WtnLqB0e7BR0y4KWdPkLT07psS0BkaYMilGNg42mcC
+OAwLTtK79huoJP2BxVZ1oPLpY6dF3fnITsFjyh2cj0H0ZuJg0T0xKB95NAoeDF7e
+hGfaGWy7oVqnZiayEcb3scdJF/1k9F4JstZqlhkOmwzNrIWsONSY9ukCjKVkDJH6
+CUqRtT+qPyn+1nGq1avFkqI1ZPUX9xRid4HSzjw4zRCHfzOgge2H9JdV5EIYv3yQ
+gRh6cKuf108sdtSXdlfI
+=dDTl
 -----END PGP SIGNATURE-----
diff --git a/app-admin/apache-tools/apache-tools-2.4.7-r1.ebuild b/app-admin/apache-tools/apache-tools-2.4.7-r1.ebuild
index d9dd1770e957..08d2db88120b 100644
--- a/app-admin/apache-tools/apache-tools-2.4.7-r1.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.7-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 EAPI=5
-inherit flag-o-matic eutils multilib
+inherit flag-o-matic eutils multilib toolchain-funcs
 
 DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
 HOMEPAGE="http://httpd.apache.org/"
@@ -27,6 +27,14 @@ S="${WORKDIR}/httpd-${PV}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.4.7-Makefile.patch #459446
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/sh
+	[ "${flag}" = "--version" ] && set -- --modversion
+	exec ${PKG_CONFIG} libpcre "$@"
+	EOF
+	chmod a+x "${T}"/pcre-config
 }
 
 src_configure() {
@@ -35,6 +43,8 @@ src_configure() {
 	# Brain dead check.
 	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
 
+	tc-export PKG_CONFIG
+
 	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
 	append-ldflags $(no-as-needed)
 
@@ -42,16 +52,20 @@ src_configure() {
 
 	# econf overwrites the stuff from config.layout, so we have to put them into
 	# our myconf line too
+	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
 	econf \
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
 		--sbindir="${EPREFIX}"/usr/sbin \
 		--with-perl="${EPREFIX}"/usr/bin/perl \
 		--with-expat="${EPREFIX}"/usr \
 		--with-z="${EPREFIX}"/usr \
-		--with-apr="${EPREFIX}"/usr \
-		--with-apr-util="${EPREFIX}"/usr \
-		--with-pcre="${EPREFIX}"/usr \
+		--with-apr="${SYSROOT}${EPREFIX}"/usr \
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr \
+		--with-pcre="${T}"/pcre-config \
 		"${myconf[@]}"
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
 }
 
 src_compile() {