Fix cross-compiling by avoiding executing compiled configure tests #432120 by Dennis Schridde.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 72 insertions, 22 deletions

diff --git a/sys-process/lsof/ChangeLog b/sys-process/lsof/ChangeLog
index 3ae5f93d3183..8eb9484bd098 100644
--- a/sys-process/lsof/ChangeLog
+++ b/sys-process/lsof/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/lsof
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.91 2012/05/28 16:22:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.92 2012/08/22 04:03:33 vapier Exp $
+
+  22 Aug 2012; Mike Frysinger <vapier@gentoo.org> +files/lsof-4.85-cross.patch,
+  lsof-4.85-r2.ebuild:
+  Fix cross-compiling by avoiding executing compiled configure tests #432120 by
+  Dennis Schridde.
 
   28 May 2012; Raúl Porcel <armin76@gentoo.org> lsof-4.85-r2.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #413273
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index c95a4cdc2246..fa6d4467d259 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -1,25 +1,36 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX lsof-4.84-rpc.patch 7293 RMD160 ca0d8a0bd21d8f35cb4e0ab3c2c3461a31722cd5 SHA1 1eac4890fb4cfcce8b949b0c01137f6f818a7c64 SHA256 465080c325f5e6a64cd51e4bbefbce6136368e034cf0dd4a4e65424f687b19a1
-AUX lsof-4.85-arg.c.patch 703 RMD160 cea650d614ff88741d30215fcb0107ee107347ea SHA1 b5af3bcbc91426f0ea07760bd15fa4bf687f9806 SHA256 a517f97ae897dc1d1c7c4e1eeb2fe4a4dab646004c07457709f823e41e57bd43
-DIST lsof_4.82.tar.bz2 793919 RMD160 de7e8441ec80ce13ba7dbf8b023a6403bd670841 SHA1 200aaf7494bddab4c47eea2466c65e57ef2f3786 SHA256 cbfa9fb6ce21b77f1be8a9c0b7fa245965120d968876212697b92617c2b0bd0f
-DIST lsof_4.83.tar.bz2 753094 RMD160 9a03b41362d68f93d9e7c2db824c8af6df978aa1 SHA1 1aee4c8de6959d84613030a65e90855a922493bf SHA256 b89f930bbe36b970e3cd070b9860ee701d8c7285ffedf2fbcec0e5fa3cb1f544
-DIST lsof_4.84.tar.bz2 758615 RMD160 c7df81cb9c83d4e03db395397912138953529510 SHA1 b4fd6011fc183c0602bbba2116b8335a0c57917b SHA256 20893a2d9b443fba519602f05692d5f72054a9f6dc1236bcb2616cc5330dc725
-DIST lsof_4.85.tar.bz2 763397 RMD160 8ce0e8aa4345b9c2063e9ea88a54dadcab635613 SHA1 d6b40a2de66f541e950b3f174437c9ede7d12b6f SHA256 49aa58e63539c45bada514a6a2e5a1c9f946ada1f4137dc9154cf4bf6054a1c1
-EBUILD lsof-4.82.ebuild 1564 RMD160 d451bf9bbf6318334a8e50f4b1d2ae50e38c327b SHA1 1a61666e103094593ca8af48af34e161a43bb95b SHA256 ac4cdea0e1eda34519b941d1c683de9e4b0d67180ee3d0581dfb40dd180263e9
-EBUILD lsof-4.83.ebuild 1448 RMD160 147c474f1ae07368acd3896ec6f292abe7000e2e SHA1 9f5c74270d5dc5e48677f6722ff33fb89dfdb6f1 SHA256 4bbeb0a560aed53ac126fb73acb1bba70daba2b1de4a5a7dc8d031ffcb6bab4b
-EBUILD lsof-4.84-r1.ebuild 2268 RMD160 e000a747a16c94606f99716830694bc5b80f1cbf SHA1 53e9babf41fc6c712be26843242af7d855364b84 SHA256 668900327137a9f969204a52d8e8fe0a052caf0906c805de928c42d17f846f6b
-EBUILD lsof-4.84.ebuild 1455 RMD160 e5e3839ad68d999b73adb619d1bfd8b91bfc74f3 SHA1 77db0f08cd793614322f2ca1e03580d7e158f428 SHA256 1a14c9fddadb2c80100da2b85d6cb2d641bfeab61d67b342382d0cf6773198f9
-EBUILD lsof-4.85-r1.ebuild 2264 RMD160 90d1f0a420d6fb9f62d75a5aed2665df0096b9cf SHA1 a2ffc805e71bb960db23188655600abb4668b532 SHA256 dbe1416689172792b9debfae6329cba78196c89efcf639ca7f5e564168aeea82
-EBUILD lsof-4.85-r2.ebuild 2292 RMD160 8f5a7ee7c78aad9364454bcc80c40e397afe285b SHA1 86427375b63e9f840df14700eecf12921f15f71e SHA256 f7aae1396ced07020e0aa47e8e52a5820de9f29e989914f7ffc4d72a9b4e6add
-EBUILD lsof-4.85.ebuild 2214 RMD160 7ac17db847bf6bd985ec33fd520cd1f31ec469e7 SHA1 5047dd85e68450a5e3484f879169d6ea5d4e6936 SHA256 44833225a1b75cf66131f35220fee6b4f33de11d35bb505792abca040e27fc9c
-MISC ChangeLog 14901 RMD160 6aeb63e84aac04b34de41201aeaa1a04e89fb1ed SHA1 dd4ca34882a2999f42f07de425353910d1759d65 SHA256 6e0741b721b88343f907dc4ca3ab37e0e9e9aefe1279b794c10eca05c2e52c9a
-MISC metadata.xml 238 RMD160 c0918b440085b691a6da31dba31384758ae4d214 SHA1 2cae35a26364573c7399f53668fb73dd6923b09f SHA256 27f27d7c7ba9fb670a6867a79ff8af354e48735f9bd672d387d96b4bd49d415b
+AUX lsof-4.84-rpc.patch 7293 SHA256 465080c325f5e6a64cd51e4bbefbce6136368e034cf0dd4a4e65424f687b19a1 SHA512 210a65db01d748d5b7372fc5403d2e08c7ac19273bbc07dbf45653ca880be518b63a82e67df2aab7a4f446609352cb5c591f1adb87e02854203dd8e8411fc7e9 WHIRLPOOL 6043d6851809ff49309024f33bc98dcae7b821f33d5afed4b0408eb6f8f9594e8416c6f97e3eb845d7ccaa86dc10cf1397d0aff1fb0e23d2d195d5a378e5ecfa
+AUX lsof-4.85-arg.c.patch 703 SHA256 a517f97ae897dc1d1c7c4e1eeb2fe4a4dab646004c07457709f823e41e57bd43 SHA512 fa0b510e02647ae13515491240f7a2aa169c19f14a3a02ac9735a067ca509613a0aaf00b4f01e8f00a032a6320d15495d876fad3b4903c48df926ef5e8a397df WHIRLPOOL 80ee5f343120caa1ef104d6c0d542357eccf7e14981605cb8f5f82206e17a5f6d25675e3aeeb9c3cfdaa51e8c781aed8273f5e99dab115e0af926cfb0521353f
+AUX lsof-4.85-cross.patch 1000 SHA256 5067c73c65d9cbe75213572423d0ddea02a12ba7f3509767082cd9b6faf8b174 SHA512 399df859f225a69a7211c81439883afba38562d72b0d320dcf19acf7b705031963e97469a322af919d05aa14af501af6137301c24a29f871f59253c6d6a647d7 WHIRLPOOL b258a537f44d24c3e2bbc771476e98f79a3bcbf9b4d9d1e0f2779f9eae75e0a19eb8348a0d23ca2c9ad4d1835b859ec4f6ded74fd9fd5b8594d19bb1c8ff086b
+DIST lsof_4.82.tar.bz2 793919 SHA256 cbfa9fb6ce21b77f1be8a9c0b7fa245965120d968876212697b92617c2b0bd0f
+DIST lsof_4.83.tar.bz2 753094 SHA256 b89f930bbe36b970e3cd070b9860ee701d8c7285ffedf2fbcec0e5fa3cb1f544
+DIST lsof_4.84.tar.bz2 758615 SHA256 20893a2d9b443fba519602f05692d5f72054a9f6dc1236bcb2616cc5330dc725 SHA512 e5698ef3f0cbe36f52d5ed33b09cd2a405ce2053831b890fcc96358da6e502f1f98c15436ad23b3e10bb981c53a651ef4201328e42fc3d7bb9f61cc3d97fceb5 WHIRLPOOL c32aeb837a8d2fb88b8079405e0b114077883e26fc3ce92bd96f587a9cab1b8d0b8850a5bbfc55c54c9bdd075531cf19160b420c1cdb0a990ecc380e9baec28d
+DIST lsof_4.85.tar.bz2 763397 SHA256 49aa58e63539c45bada514a6a2e5a1c9f946ada1f4137dc9154cf4bf6054a1c1 SHA512 f38356d300e18feaac09043f19c3ef612ac22cb89608cbecbc3594dd170705be855ebc5ce80b069db4a5af9bb517b1f4e571c2e175aa579214014d7f77ac30cb WHIRLPOOL 7cc1476bae92699b5b52e2e9a31713840308768b9536d2f4c904439458cd8778311facafffeea93f743db4488dc296fccfaf852d739f2b68859e10031289a6d3
+EBUILD lsof-4.82.ebuild 1564 SHA256 ac4cdea0e1eda34519b941d1c683de9e4b0d67180ee3d0581dfb40dd180263e9 SHA512 1afddf65caf173834ec3131cadbba33b5e49720c91f2e7d712d99b3a8385ce40443891e62dc1010344aea6790b5610205264ac5354ea29e5daf2b0bbde089343 WHIRLPOOL 083e48c0acea88bacbf54f9cfc4312bff78186c71af29a5a00206bcc821a174157038d5aff21cd77bc09e8900f82cc9e812a6196723b7ab995c57d043650361f
+EBUILD lsof-4.83.ebuild 1448 SHA256 4bbeb0a560aed53ac126fb73acb1bba70daba2b1de4a5a7dc8d031ffcb6bab4b SHA512 8126c9382fae82eae71738d4bd878111c011e2383f9260a4ea13a45c51ac1e862ceb032e065b195f985732608147cceb3e9db96f264f57644d2ee3abdbf78bc0 WHIRLPOOL 7c40912a81f4a8918f1376a87367f4d4b847b409492c9854987d352411026a4cbdaa5bc6b364adcb4130d6095c04c97e5b455363f5b256f49c2b8d926b24ec5e
+EBUILD lsof-4.84-r1.ebuild 2268 SHA256 668900327137a9f969204a52d8e8fe0a052caf0906c805de928c42d17f846f6b SHA512 b404337fd1b6d36ccaf5632bc6d7e0a78c38a581808eb7aecc4a775dcad1c6851d07388c1328deaf4cbb379ac40ff4c6399e6e98ab39bff3380aaa72fc0ea406 WHIRLPOOL c58bf6a5af5b8d2948f96649a1174bfce33dfbc5c877956a095a2012ae80865ff94c51bc2d204694a808278d0049bd4f976063f4c5d72f7f0ef52d7d4785481d
+EBUILD lsof-4.84.ebuild 1455 SHA256 1a14c9fddadb2c80100da2b85d6cb2d641bfeab61d67b342382d0cf6773198f9 SHA512 8c4916073ae88d80cacf2433a397b95243c395586bf184b1f7595cbd1775e08c9a40c338f08369203e688ea24467ab0c731f6e036f2e597d3ca82100fa2e7415 WHIRLPOOL 81e91f36b44d7dfbd9791c6d2305bf7f0961ded93d259e75f7877464c802daa7e896c96c070cb1a294f0640af3b5f89ea13f6003b2041838c75325edc88936ab
+EBUILD lsof-4.85-r1.ebuild 2264 SHA256 dbe1416689172792b9debfae6329cba78196c89efcf639ca7f5e564168aeea82 SHA512 5744e1f52276f893ff8ad7e4ecc98761ebcf0df062f61291c01d130b2657910e68e94c3c460c0138cfb53aa842a291ccc12feb28c477a6ae64bb5c5d49c81ddf WHIRLPOOL f02bad01a7677a82d7d7fb8299f375b21f594968c888dee6f90989aa5c7d0ff0da1a612869175c8310a6bf53896d20e0bc42a30be54dd582fb74d976321cf6ee
+EBUILD lsof-4.85-r2.ebuild 2345 SHA256 6acc4a79a02d69d9f8851afdaafd3fca15186ddd5b9e5e7372b391f5b02548c5 SHA512 8a2e790d394c5883361e33d5b39fe593e3be1afdbf474e49ee4f289ca85d7b3db741e69a7bd32aa0212aaed542d4c3ec57f6f5eaf2c8c7d75ac43ad63ec7071e WHIRLPOOL 656fc625b71d91942672a68fce71b91c9039ba3f762225c8ed435e08fbe71e07145fc40505f5c58da11970e34518e9b97c12e15b3467d67948e495a3c984b300
+EBUILD lsof-4.85.ebuild 2214 SHA256 44833225a1b75cf66131f35220fee6b4f33de11d35bb505792abca040e27fc9c SHA512 0b6b3caf047856d483c1524df2a26b1b1deb21462f30b4b1dff71e0a95504e5fa60103f0fd990777a075954857dc96f67d498c0e5d0be27f030265afad7b91e8 WHIRLPOOL 6c31a022dfeebf93a24be07714bed6ca6fda242f22903c30fb7ee826a60a8ca07f9149b05a550790b3b8ad3671a29d47b712144d7ea84ff83b007c5888cde1b8
+MISC ChangeLog 15103 SHA256 7050a8752d71a3a10ec1b7be171a42781f166554c39563d3bf59e8ecf2e19281 SHA512 1451dcef6c90088caf2dbc7d28290bae26576182c685063faf31222ccb83493bb2a68f2290fc20bb12960130ee87777b397053e27bf5b42deb0f2652071cb4ff WHIRLPOOL 61f6b9d50ead0c7bc61048b0fc97ab886517eb0ab0b91515bcc140670641d256a1324f1c98d121b703c17075163fb6369c119670ed3c041bace629d99abe0920
+MISC metadata.xml 238 SHA256 27f27d7c7ba9fb670a6867a79ff8af354e48735f9bd672d387d96b4bd49d415b SHA512 b8434ca8a5f116234268cca5c8d7cf20b3187e1f2c326bfe3693e2e85c2dac961618b39a20d0d5b7a01744b5159057e2861eeaff7fef6a08e0fc4c1b47bbf778 WHIRLPOOL f3ada27de4f86d469929230f1649727d91cc303e007ae728038062a04522053f0b49559d5bc4b6dd203744ba117d1577d03d62a1cb5d7c24c86c268edf057761
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/DpkEACgkQuQc30/atMkBMYgCgtJXsiMCEIyXXEPtCFex+Nbcg
-Iq8AoLD4c8DK57qbaAxVwFE7Rd52RVTC
-=sgBM
+iQIcBAEBCAAGBQJQNFocAAoJELEHsLL7fEFWIyMP/1XP//GXzJ5KmXzzjVzt4bl2
+0ieXJNJghy2Terbk0R9Gs9rxJAHLO+oG+QeVRUpoqoSpMqcRQbRjnNM08lcpIBuU
+yrh7oLAHfkPW2Q5KDHwDRR+yyWfW2JPN1CtD1+1/JDgSzgv/iKY1wyCDp1zwefxW
+pd59bTTrSGxU5YMygFNtd6GMlKxj+7PsWTK+gw4wkw0rgXIVD5R8GDWzxdvGo5OC
+rBtvusX4je2znwN2R15rhB+5D/z1wzASZD2CYVg6+kJWdqWoAfguUu0EAVE3IuUh
+XPKR5MfNCPO43+CsOtGMK2nzFXndI++ppL+3ECTq3k2fO+xuAYDjU892GgInlLGW
+W10O1W/9dNiVhNpjaLVLdJd7qC+Cz5uztCW9TNDwQCgtTvtARBKzTB8d/7nJmoOs
+aZuY6cXBCmw2lgf9+tTHvz/uft912WCVfm4yO8aKsHjrnBnsMesKOD6VA4rezxQr
+pF2gsn2oBBoreyqq/ZliTVXa6TfxyT0FK6ztpYl1kzAwcx3f4Uu7Uc/0ZJn7aUOo
+EJKJp8g65/up+JfJCz4PNDLU00wYACU+1fpMyuaEi3LW8UqlRFggxYK+1X72x+eq
+YQb9N5sodRqYHEBzJvp6R7R8D+mYd/BPUxwBRh9xFru2SlU594L7vqn3JARPFVJG
+ij6DjJHX78YPz58aXN+6
+=ubBI
 -----END PGP SIGNATURE-----
diff --git a/sys-process/lsof/files/lsof-4.85-cross.patch b/sys-process/lsof/files/lsof-4.85-cross.patch
new file mode 100644
index 000000000000..186c6d8d6229
--- /dev/null
+++ b/sys-process/lsof/files/lsof-4.85-cross.patch
@@ -0,0 +1,33 @@
+let the preprocessor work its magic rather than executing the code
+
+https://bugs.gentoo.org/432120
+
+--- a/Configure
++++ b/Configure
+@@ -2730,20 +2730,17 @@ LOCKF_OWNER4
+       rm -f ${LSOF_TMPC}.*
+       cat > $LSOF_TMPC.c << .LSOF_END_HERE_DOC1
+ #include <features.h>
+-main() {
++#undef XXX
+ #if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
+-printf("-DGLIBCV=%d\n",__GLIBC__*100+__GLIBC_MINOR__);
++XXX: __GLIBC__ * 100 + __GLIBC_MINOR__
+ #elif defined(__GLIBC__)
+-printf("-DGLIBCV=%d00\n",__GLIBC__);
+-#else
+-printf("\n");
++XXX: __GLIBC__ * 100
+ #endif
+-return(0); }
+ .LSOF_END_HERE_DOC1
+-      $LINUX_CONF_CC ${LSOF_TMPC}.c -I$LSOF_INCLUDE -o ${LSOF_TMPC}.x > /dev/null 2>&1
++      $LINUX_CONF_CC ${LSOF_TMPC}.c -E -I$LSOF_INCLUDE 2>/dev/null | sed -n '/^XXX:/s|.*:||p' > ${LSOF_TMPC}.x
+-      if test -x ${LSOF_TMPC}.x	# {
++      if test -s ${LSOF_TMPC}.x	# {
+       then
+-	LINUX_CLIB=`${LSOF_TMPC}.x`
++	LINUX_CLIB="-DGLIBCV=$(( `cat ${LSOF_TMPC}.x` ))"
+ 	LSOF_TMP=$?
+       else
+ 	LINUX_CLIB=""
diff --git a/sys-process/lsof/lsof-4.85-r2.ebuild b/sys-process/lsof/lsof-4.85-r2.ebuild
index 2b65dd055093..8315e4e30ce9 100644
--- a/sys-process/lsof/lsof-4.85-r2.ebuild
+++ b/sys-process/lsof/lsof-4.85-r2.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-process/lsof/lsof-4.85-r2.ebuild,v 1.9 2012/05/28 16:22:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.85-r2.ebuild,v 1.10 2012/08/22 04:03:33 vapier Exp $
 
 EAPI="2"
 
@@ -32,6 +32,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-arg.c.patch #388555
+	epatch "${FILESDIR}"/${PN}-4.85-cross.patch #432120
 	# convert `test -r header.h` into a compile test
 	sed -i -r \
 		-e 's:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:' \