Fix cross compilation

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 28 insertions, 14 deletions

diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index e1381a217374..b81dc8475b87 100644
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/iputils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.79 2010/08/14 13:56:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.80 2010/08/22 01:00:58 lu_zero Exp $
+
+  22 Aug 2010; Luca Barbato <lu_zero@gentoo.org>
+  +files/iputils-20100418-proper-libs.patch, iputils-20100418.ebuild:
+  Fix cross compilation
 
   14 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   iputils-20100418.ebuild:
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 2ed704c5b28e..501af4ef29cf 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 021109-uclibc-no-ether_ntohost.patch 635 RMD160 234010cd5aadc5086beb638c19514659974939f8 SHA1 8e7fda98a1cc1fae5b8f75f9aec200fcb3afee49 SHA256 cf8135fd380918890a1da8de438d5283111f1e9ea0754b4f5c78bb703fcf617b
 AUX iputils-021109-gcc34.patch 2313 RMD160 354dcdc651bcfb88bd96d9008367854e91a5f7f7 SHA1 97baa39948144d83f0d484d2c5df0c8efc924590 SHA256 f015536e6b043aacdc7e55afd2394ecdea4d1aeeb33780e3857374788321bf9e
 AUX iputils-20060512-kernel-ifaddr.patch 1732 RMD160 88d0f57dc248e67fd7a7c6ca5705a721c553a177 SHA1 6e2617524eb6167476bd51461f43b24e619fcc1a SHA256 6b6d1e80ecb2a1bf8b5887c653abd6403e5edd743638d60eb07bc491b91bd7fe
@@ -15,6 +12,7 @@ AUX iputils-20100418-aliasing.patch 2897 RMD160 210d763dbae8d31485a5bf1f1792cd91
 AUX iputils-20100418-makefile.patch 974 RMD160 81e2022321a3af15eb3f025e8ad74d19690aeb21 SHA1 abaffdf7a61e00907de221afada04d62c58e00a4 SHA256 910914b0184a65aa15d42979bb7e3d272697310231005673cf2f46648deb6a4b
 AUX iputils-20100418-ping-CVE-2010-2529.patch 513 RMD160 a7de880c7033a19c889e57a6d8a63c0f7d7a08ba SHA1 2c25c562cb01f0705f1d8276db24e98f3525df3e SHA256 a78f0a7977b5b3860495523e3728ae5e604e7b97f036edc93cac5856cd9c9a1a
 AUX iputils-20100418-printf-size.patch 1658 RMD160 5ddc3104d1819d009a5cc0280a9d5450a4210d6e SHA1 47d280f6ce48086ec256ef1680db9de712d49e7f SHA256 95ce6cdf73cd5dbfbd962131fc1f6513713d4874ca161f5b24eaed21d58a1cfc
+AUX iputils-20100418-proper-libs.patch 473 RMD160 4f80219c1237c01893dcedc742ad60bd5477075d SHA1 6143755e384c3c49e6c1aa7ddd3ce4f28ed1e829 SHA256 86f35c22ba234b7fca8639e2dd771f9f5bba21da07685ebdd8b2912c94098656
 DIST iputils-s20070202.tar.bz2 88678 RMD160 f6c3600a350537210d6ca43d1b82806bc0fa88f7 SHA1 44a299db16543a68fb80b06d5e6c88760af2aa6e SHA256 86f9f9970b4e2258e5e985d4d74b6ba9145410006c73b6482170525deb0c1957
 DIST iputils-s20071127-manpages.tar.bz2 11796 RMD160 ce07a3837501c32af297914260273c89e134f42a SHA1 76a333ef987bab15abdea77d7edcf5977f5d781e SHA256 891363d013e8c939892a5860e8b2d1e0f002d6f2372c546490346d9348318d0c
 DIST iputils-s20071127.tar.bz2 88796 RMD160 2ca3d0ca25c7e0a197176a7438d803171d4e74e6 SHA1 56c8b6c5999b96f47f5b3b37dcf014a33cc7cb22 SHA256 dbbd87554d66e438245487ac31aa4a542a1c6c1ec8273cfacbbfeda09eb44a93
@@ -24,14 +22,7 @@ EBUILD iputils-20070202.ebuild 2043 RMD160 7974abd26a600ffb24f24e3adea2f846b2887
 EBUILD iputils-20071127-r1.ebuild 2192 RMD160 2f2538abfb9d787cc148abdfa1f1fd6e965ac5e5 SHA1 15157576ee579cf1e582c0a141519020e5541f8e SHA256 3fb3d190062b61ab9c3586d5b31432003bddfafcb425e13099d95f9d69f7cfa3
 EBUILD iputils-20071127-r2.ebuild 2323 RMD160 a0473c2c8841ac32b12a6118807a67028289582a SHA1 ca78bceb7c7497c7f36f645fc6db4f179f84367f SHA256 4f469e2813d16791318e01e33cc35ee85ff5ac570d08fa1fc8ebee7320f1b1ca
 EBUILD iputils-20071127.ebuild 2059 RMD160 bea5e3eb0cb791489dd732699b680b7131429732 SHA1 45be95f84871b9d68bb14dbc88c4dea5aa2aca4d SHA256 8cac35689da454772354202289eb01a36b29059dbf7929938c12b0bb09e97954
-EBUILD iputils-20100418.ebuild 2135 RMD160 b851e3bd423123fefbf09d6d29fa3c53966f8a54 SHA1 de495dec6185a0e6e20d190b9bb6c20397ae3157 SHA256 07e4339e640408a106691ed4a90075f660ec4e69ddeb201d75dc1018f05543a5
+EBUILD iputils-20100418.ebuild 2188 RMD160 5ec0767aa97a28b59a4f7cf26136d400971cae2c SHA1 66b29dab6993bb98add65f0646ef9006cfa662af SHA256 f50843db9199d83cd1325d308eff8c5dac39ba279b2db5b82ab8edaaa907ab00
 EBUILD iputils-99999999.ebuild 1690 RMD160 6a12ea8de1be1877c69117bccb296381f0a88fd4 SHA1 340e3dc9d7e354629db429930cb5a64082a62798 SHA256 5e15b7bf264c4ef2e5c69d6e2f78a2aa279a89e05e10651ec08f85788893b103
-MISC ChangeLog 11730 RMD160 f33d587100b51211192bbdb45c04ff0e2642bc26 SHA1 5544a345a73bca54b3adc9988d45059312031c0e SHA256 e9895326dfe361f3f924be69148aee850e146cc6e0a28d4b9c2f53802dd1f658
+MISC ChangeLog 11872 RMD160 ba63c35a77f31149221dd1ac532f9f69a5967e45 SHA1 4cb8ad8987c61cca2ed160738810fc4b7afaaa97 SHA256 c0c92f2b038fa1762e703a9533efb829bffb2f17f01e649229ea12e398babeb3
 MISC metadata.xml 299 RMD160 44839875595bd58f9d7f5245d366eb3d0e1ffb1f SHA1 224a2c26c04621e6277b1d887902911e4a9bc2eb SHA256 d028d4ba25f3ed29afbbf77abd924a617098bff71e6a0c37b7d6c0a24cd65a78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkxmoHQACgkQAiZjviIA2XjftACg0dI5LPmESTGdEbvSQ9u/peNk
-YW4AoPSt5X9OLZ1XLRxw4DbJ9BKL7TAN
-=0nwj
------END PGP SIGNATURE-----
diff --git a/net-misc/iputils/files/iputils-20100418-proper-libs.patch b/net-misc/iputils/files/iputils-20100418-proper-libs.patch
new file mode 100644
index 000000000000..457ca39ce1e7
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20100418-proper-libs.patch
@@ -0,0 +1,18 @@
+--- Makefile.orig	2010-08-22 02:51:52.000000000 +0200
++++ Makefile	2010-08-22 02:47:48.000000000 +0200
+@@ -28,10 +28,13 @@
+ ping6: LDLIBS += -lidn
+ endif
+ 
++arping: LDLIBS += -lsysfs
++ping6: LDLIBS += -lresolv -lcrypto
++
+ tftpd: tftpd.o tftpsubs.o
+-arping: arping.o -lsysfs
++arping: arping.o
+ ping: ping.o ping_common.o
+-ping6: ping6.o ping_common.o -lresolv -lcrypto
++ping6: ping6.o ping_common.o
+ ping.o ping6.o ping_common.o: ping_common.h
+ tftpd.o tftpsubs.o: tftp.h
+ 
diff --git a/net-misc/iputils/iputils-20100418.ebuild b/net-misc/iputils/iputils-20100418.ebuild
index 1523224cf099..cfd0f9e84d52 100644
--- a/net-misc/iputils/iputils-20100418.ebuild
+++ b/net-misc/iputils/iputils-20100418.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20100418.ebuild,v 1.2 2010/08/14 13:56:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20100418.ebuild,v 1.3 2010/08/22 01:00:58 lu_zero Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -28,6 +28,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
 	epatch "${FILESDIR}"/${PN}-20100418-makefile.patch
+	epatch "${FILESDIR}"/${PN}-20100418-proper-libs.patch
 	epatch "${FILESDIR}"/${PN}-20100418-printf-size.patch
 	epatch "${FILESDIR}"/${PN}-20100418-aliasing.patch
 	epatch "${FILESDIR}"/${PN}-20071127-kernel-ifaddr.patch