Use the correct pkg-config when cross-compiling #442354 by Bertrand Jacquin.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 97 insertions, 4 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index c027d42627b6..c52b98597315 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.202 2012/10/09 04:30:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.203 2012/11/08 16:40:45 vapier Exp $
+
+  08 Nov 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/iproute2-3.6.0-pkg-config.patch, iproute2-3.6.0.ebuild:
+  Use the correct pkg-config when cross-compiling #442354 by Bertrand Jacquin.
 
 *iproute2-3.6.0 (09 Oct 2012)
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 58ff0ef82f3b..ef4c2d188a6e 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX iproute2-2.6.26-ldflags.patch 330 SHA256 c7206270a72a9e0aa66ddf641d10a384501e58b87917b1e3161f297349b8ec13 SHA512 f85761a4e6861bb0b66a455aaf09e7bf13a0df8f05f62207390a53a4587a0a52418469f8478989d7dcf3c640436e451fe7f33dfa62ae6ca87648da3990fd3275 WHIRLPOOL 6eac5c446cee82a785c3770790ade86960ba99ae17cbb6eb3d6f8cd50cadddc85ff9f3da70d212c6b42e12e725f9ab2f3ea4a219b846d67b8f79ea6e8221d096
 AUX iproute2-2.6.29.1-flush.patch 5669 SHA256 13007eb0335e4a8a88f4946cea9fc61ee4fbe840ce308279696212b11aa1928a SHA512 e6d9898f420386507938f12b486383ecc057dda2862117372b0481fd7807d89bd14f8d6e17cb84e83b0eab7eadac8662e6d4da9d51acffc6bc558ccbebdd7157 WHIRLPOOL 1153a05968f3a17b44653bd673d717044cc445b97a57873055971ad3903f8ad306935edb227aed4c3e277907d92171d61f60300d6ff4b437ba81ea12af26fe40
 AUX iproute2-2.6.29.1-hfsc.patch 37615 SHA256 4d41873a00841749a47142dc5591572b2d7df3b4d4c56d8dcebeb3c4cab30672 SHA512 98a4778434d0014c0032dd6cb82c8d616406f36ab8d6b5269046b5b5bd12b7fd0b83aedaae2c95522a23c1df7b34fcd0ac2e5b39fa23ed66e98970c794fe461c WHIRLPOOL 99e09caf201f710ef1d99418f736cf56b0033db0fac9c2c2e981df15eec5f8d38707c54a728d220d770e2b2e53df9ef97f30ae1556165f55bdc0cf9687622350
@@ -8,6 +11,7 @@ AUX iproute2-2.6.35-xtables.patch 1027 SHA256 4f2227b31407002dcad8d547fe61e8b5aa
 AUX iproute2-2.6.38-parallel-build.patch 1191 SHA256 fe3cb7e51398c6f6929e93ea03a822ed404d0e1cb302f4ca9e8fcb350b1abf18 SHA512 0d2546ef7474d84726e414ab774401ca6c8fd727cc4d66a111dd96dd577a31ffa74dd8144d943b633e2cd1e0a7c3379e5cd4866bc00a0be082628611fbd8d7df WHIRLPOOL 2775b4fbffd715b11c12de18a77581bfb525fd3e6e9d2e9a7776370961d46b5db43456230afc133fb22c698905dab646334a6db828b012de9ec627a363f1b126
 AUX iproute2-3.1.0-mtu.patch 1649 SHA256 d8d1d3b81a3fd5674e6c9e202bce9e84f41b579ba2c6a554df3346f4642715af SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1 WHIRLPOOL b813f1d9dcdbfb525fb07a462f7faf1c13117dd3e9e584b1a033cb69f3dad9d4b8e5120f8512185f24769e6be0aabd6635ad3996342dc210ff513866e7638502
 AUX iproute2-3.1.0-no-ipv6.patch 1352 SHA256 ee93d86903e6f0aff54cd3c861f91e3d37639d7fc975c9c088f281f1ca8017da SHA512 b80f190d58c0ba5ab61185648c039133d870f72e9b270e905cc93aa335a20c1d880b00dd32eb7cd427c40f4e3182936b6b3156884ebf9ff976da0b76759ca9ab WHIRLPOOL ea155aa0e5c23b78df11b38613a763ac3e4674fd0c8aebad2f25c975e668ef00bd4b47a44e69f5bf5557d547436434a899dcfbd723d64828aaded76b207708db
+AUX iproute2-3.6.0-pkg-config.patch 2286 SHA256 46649856ad9e735e403bc0654d1c1afceb13a0566079ad52d62575efec4443d3 SHA512 ab90d85930357e5ab6fcf0b26d4661b485db99f9617c44c714b0035da8259f65f60f637be7f1e8d74e57f583251e1e28b11dc41a793d49b2abe87c0e458f2d28 WHIRLPOOL 14901196812106789df01f1459e8abe7a68db699f2e3416d3d0e30ac33fc9638eeb0c0d443eadbde312fbbdf49c15f9c30b3ce303bc3e42aff7a3292c1de8d39
 DIST iproute2-2.6.29-1.tar.bz2 367905 SHA256 13ffb0ffe5404c9dcc8bed8c692f07d934aa3fd44661df79dd1efbb37f83fb9b SHA512 5c8e9ba81c6c6566aa3827bce9e1132a166a2a620a38de226f36779c45d6c1efa1d591a845c82c0456508448b555863199aeda3a5d15f5b10ddc093b9717c3e1 WHIRLPOOL 107eb626d3d5feff3a476c41a392b19e12ae240eb06815886a7fb2cdd2e85ce05f3af80d1cf42368ee8f9957c3502c4facbd5ec937e4da0986d8f1f5aaa5dd40
 DIST iproute2-2.6.35.tar.bz2 387193 SHA256 8ab2f47e129925fb8acb09421008d07aeafa01b2ddd1fcba4a056de079f090a3 SHA512 df93100d350f3153e6f7ca627ebb207af53a2f99a1187a12dcc046da9d87aa847817f77a50c3fed86034437d7394b376b7b316449690150ed2e3db2d998b6a94 WHIRLPOOL 865a2570314f7b4bc32c6d7c722ecbcfc007662c29801cd9402161943e9d9f7a1e7b0954ffbfa215960056c9fe1e1d327dcb7f0be899f398fd4fe5a0c14d9eb4
 DIST iproute2-2.6.38.tar.bz2 390166 SHA256 47629a4f547f21d94d8e823a87dd8e13042cadecefea2e2dc433e4134fa9aec4 SHA512 b3a0c15c41184554da1b7f2521f5f0586ae0df1a62899afe2514d4adb93f05ecfd10fc964e027ec8f83a990586f5858b0c9fb24ea8c78477ec6c7c51593c54bd WHIRLPOOL bbd3a415c8396adf1ab63f2f3c91591c65809f8da12f6333f6ea66997cbca428ec2339759f53d0bcc41a1e9c85718e598efde0206a000d394560cacc9a78e8cc
@@ -24,7 +28,24 @@ EBUILD iproute2-3.1.0.ebuild 2781 SHA256 dd626ee648fad23524fc67e08652645f8178d34
 EBUILD iproute2-3.3.0.ebuild 2972 SHA256 1e09b07a850aea92e7e57a0adef53246ff7cc8d8498ba7ccadf8eb0cd814bebc SHA512 2ddd5321a9f378322b72fe5fd9dc7c45b6e2ef26cacf42f5d731127b8e249495e2adbb36f1972174424f28a493b4a82b5610add9961855a8559d746cdbab9eb0 WHIRLPOOL 5c3716f6ab9a18e2fea0e8acaa0e2bd347edc189e2b485e61f5373327c7f675499f7e239961697b78e21393dcde2a5994c17c420c649b3503fdfaefbcbe1fa57
 EBUILD iproute2-3.4.0.ebuild 3002 SHA256 345f9a7580ed2bb81811c60bd2a66ea580b5b10ee4dde9c3abc22d7cf21664f1 SHA512 d1dbef1e35df618cf9ee1647048f258d5bd7dd903d7face73b948293867189889fe99365d4d0e66423ccfac59ae3c271f7efbd5af37b339a944afe10511043e9 WHIRLPOOL e2edadcee3aa3bb4ccc6668e7edb32125e888f8ac0b6fa0753733494829a26f5cf70d44894b4992856210f0d85d5e4711f36c527899990c24ca19e876abbfead
 EBUILD iproute2-3.5.1.ebuild 3055 SHA256 90734a1a0822fea2d81649a2c6f06aff648903a393cb57906b560b16da41f02e SHA512 07550ab66ff8aef3afb76d5083c74548f77f9cb2a944261f2b32756011d25bafd4c83b5fafc1283ec0a96c564d84020a6b8381b55dcefab9d03fc426f31b6682 WHIRLPOOL b39b2b78640f59b7dafe3904ff245b298a9e1afd7c34c3d55fd1073b3a583fcfe28464096c4666151ff8a64f94f778007d93f8e0d91795ae6a239cd7871164c6
-EBUILD iproute2-3.6.0.ebuild 3055 SHA256 ed6a0dbd89dd65b5d49f89804e457f0587e8845e6aa8c36e90f64ccc0b010d18 SHA512 f34c5e66bbbdcb2fdccea4e1631c92bce654e0efab95911e65e4d9fd447580ee17e601111873ffa7d59e989512efa518c22283a3fd26dd6fe2b020799d706c6b WHIRLPOOL 6f0e99f1f190f6aab05c04a7d1e4aa05083d31675860961d082476dbd2ca42966e336fcd603a58314a58646ffcf05173bcb60dee6c7d4734f9105745b86eb442
+EBUILD iproute2-3.6.0.ebuild 3114 SHA256 72459991b542f96e5faf4d342a2f22376b5b86925ce60f55c942b15818c930fe SHA512 4a4fd992d44ff336e11d095238829182b50384a80a981ffeddfc954384ecebb2f525e9c24930829959cf16dd474e5b0ded553b4ea41fe26379493b636e088402 WHIRLPOOL 378588c27d859d341167471cc8fb9402163b1667279696274a70355320684b231801e4501b5c65bffba85963579b985be84518917805b1633a525b2dd35a419b
 EBUILD iproute2-9999.ebuild 2781 SHA256 f0f412903b121408f09043221d01e67cf3fff3b75d243741e75d33a896f59c75 SHA512 35bf694cacb3fd703f6ea28d780086b0080b5c3a0663d51e8a839535fdd1edde9e047b3f4ce48726e56f704f078d9ff5d8ef9581bde06c9c78099a43adf568c6 WHIRLPOOL 5253ae960058e13a6f359d7422611aa9b3de2fae928c980f04f30a9fcba80ea6d63591388df22e67b455e60f8a329bc336c63c3d7e59864e75b7d0177c01b955
-MISC ChangeLog 34797 SHA256 8279c8a40d2368422b26d4adb4bf262d910bccadd36dea0fe57ced984c519340 SHA512 7118eb97843d2ef3226528f2ee2a288cca77e4ec0994fba171481ac0a556f02f7009c6fd787a3f155630b6c7a5006841f0414cecde890710c724f9068970c9fb WHIRLPOOL 3e671ac554ba4083e4d2e170ee751c51232375412cd13714d9aab36ea20f22cde112bad8288e00aedbc4f5904497a735dd64107885fbf23776868caf63cea52a
+MISC ChangeLog 34992 SHA256 cddb7244428dc2792ceab4c0013f62b8c0c8c3df836834a86101d6e74758be97 SHA512 a3d474231a0bfc02654d2e869f7d91c86e365e33c18b9d02e28e2d553689ba48f97afafebf28ea44055510708fb4b08b1330b5e6c8fc29006eeda5c525af6606 WHIRLPOOL 1c499985801be8500adaa99925bbe00992ce5a0fe48d8b29eb79a59ff9bf6dcae4693d6519fe13e45dbd48216c25c1adabf4ba5177abf814b745676646880c8b
 MISC metadata.xml 246 SHA256 f081ffa604caba81f8229deeec7b8d4694d83c059564d7c941f7b942b8385012 SHA512 77c1cbd10e26f7663334d68fcdf907ccffd0252a847c3e090885745f8ab1e87b9698792176799ce7cc592af6baeeba1fd1ddb31f5888399dfa8edf2b08e502eb WHIRLPOOL c721b8410654303b96f723f0ab9ce23ddb84ad0d9c5b1703bf6507cb1b7a3beee45f876945a07386f15374caabb13b40f4cd1cb21d5bc51ff7416072437deea6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQm+DKAAoJELEHsLL7fEFWDWAQAIERPcEu/Gl+up/9nrXp+ODX
+BTg12nVsq9BqUXPI8DnLu7WOpZ/WDvcBqSGSij890RSQdtbYfOJsxMgEwEsqr4/D
+X5KKtjaqqw7Vv8xLJUdmCptsrAbqX5CH8IpGH+mzR7G7OrB4EvL5DEm75HV+hr/W
+FHOG4+N+Gzyaf0F4fBCXdvUahLWB5Ai7WZxtfR4eEEG3L5cS52n7KSbnpgrBOeBs
+vn+qXo/Fy49C+6PxODGETOK6N1fOT4dSepmW8O0Bs0nDPplQPGaIwMHWYBfH9GHj
+SrxnqdLwfR1jd6TS67v6eTdUGlIt+RsWFZLCB2du/gIR1qfmX1MNChfrGx9Fo2zS
+RwxNYPaC/8fJja43AxiWgAQ5lRfUV/EJJW0NhBr3vrnQL9ikSjvwdu+v0VTkuy59
+u4Yj88CrUDLZB20GLJppu41KvgV7XQ7ukfkU7I9fFVuGFIrHvGpsFuTJAL5fhq+h
+Se7B4xkYDNhtjISBrSBDawcgrFBErUDfYAj1q5wxELUGb7E3u+W5O0h4spiA8v5y
+QTko6rKnV9CcI2T6MKOCOi90so3LEVB6Q9McFJcDMppq7KlpIuO3nt+84Q3+BAUK
+R99Fq31PsFK9niGCP9OlgH3SsqJRdVdgPefMHBy/8WVKZj/GN8MnW/kZ9nu9tOHO
+cgrwrsQHRXRTKnobZOlR
+=Fq5P
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/files/iproute2-3.6.0-pkg-config.patch b/sys-apps/iproute2/files/iproute2-3.6.0-pkg-config.patch
new file mode 100644
index 000000000000..fcfee292994b
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-3.6.0-pkg-config.patch
@@ -0,0 +1,67 @@
+From 99762cbc216bb818e9fcbe37e1abf9b313968615 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 8 Nov 2012 11:31:26 -0500
+Subject: [PATCH] allow pkg-config to be customized
+
+Rather than hard coding `pkg-config`, use ${PKG_CONFIG} so people can
+override it to their specific version (like when cross-compiling).
+
+This is the same way the upstream pkg-config code works.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure   | 6 ++++--
+ tc/Makefile | 4 ++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 2c2d1c4..0bfedf9 100755
+--- a/configure
++++ b/configure
+@@ -2,6 +2,8 @@
+ # This is not an autconf generated configure
+ #
+ INCLUDE=${1:-"$PWD/include"}
++: ${PKG_CONFIG:=pkg-config}
++echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config
+ 
+ # Make a temp directory in build tree.
+ TMPDIR=$(mktemp -d config.XXXXXX)
+@@ -51,7 +53,7 @@ int main(int argc, char **argv)
+ 
+ EOF
+ 
+-if gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
++if gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(${PKG_CONFIG} xtables --cflags --libs) -ldl >/dev/null 2>&1
+ then
+ 	echo "TC_CONFIG_XT:=y" >>Config
+ 	echo "using xtables"
+@@ -148,7 +150,7 @@ check_ipt()
+ 
+ check_ipt_lib_dir()
+ {
+-	IPT_LIB_DIR=$(pkg-config --variable=xtlibdir xtables)
++	IPT_LIB_DIR=$(${PKG_CONFIG} --variable=xtlibdir xtables)
+ 	if [ -n "$IPT_LIB_DIR" ]; then
+ 		echo $IPT_LIB_DIR
+ 		echo "IPT_LIB_DIR:=$IPT_LIB_DIR" >> Config
+diff --git a/tc/Makefile b/tc/Makefile
+index 389029d..696f891 100644
+--- a/tc/Makefile
++++ b/tc/Makefile
+@@ -135,10 +135,10 @@ q_atm.so: q_atm.c
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm
+ 
+ m_xt.so: m_xt.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt.so m_xt.c $$(pkg-config xtables --cflags --libs)
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt.so m_xt.c $$($(PKG_CONFIG) xtables --cflags --libs)
+ 
+ m_xt_old.so: m_xt_old.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt_old.so m_xt_old.c $$(pkg-config xtables --cflags --libs)
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt_old.so m_xt_old.c $$($(PKG_CONFIG) xtables --cflags --libs)
+ 
+ %.yacc.c: %.y
+ 	$(YACC) $(YACCFLAGS) -o $@ $<
+-- 
+1.7.12.4
+
diff --git a/sys-apps/iproute2/iproute2-3.6.0.ebuild b/sys-apps/iproute2/iproute2-3.6.0.ebuild
index 158c676e1c35..ad8d6ff05aca 100644
--- a/sys-apps/iproute2/iproute2-3.6.0.ebuild
+++ b/sys-apps/iproute2/iproute2-3.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.6.0.ebuild,v 1.1 2012/10/09 04:30:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.6.0.ebuild,v 1.2 2012/11/08 16:40:45 vapier Exp $
 
 EAPI="4"
 
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	epatch "${FILESDIR}"/${PN}-3.6.0-pkg-config.patch #442354
 	use ipv6 || epatch "${FILESDIR}"/${PN}-3.1.0-no-ipv6.patch #326849
 
 	sed -i \