net-libs/libpcap: Add patch for cross-compile for bug #172210

Package-Manager: portage-2.1.2.2

4 files changed, 49 insertions, 36 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 198f999d0cc1..0d8dcbf1d642 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.69 2007/04/22 22:14:42 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.70 2007/05/05 10:52:19 cedk Exp $
+
+  05 May 2007; Cedric Krier <cedk@gentoo.org>
+  +files/libpcap-cross-linux.patch, libpcap-0.9.5.ebuild:
+  Add patch for cross-compile for bug #172210
 
   22 Apr 2007; Joel Martin <kanaka@gentoo.org> libpcap-0.9.5.ebuild:
   Fix typo in cross-compile check.
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 67146284dbe6..b2b0a20f41c9 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libpcap-0.8.1-fPIC.patch 298 RMD160 4cf97341a5da39c97553871312c9381f30457bdb SHA1 e63657730f2a1d2f04ca50947ea01485f1d5994e SHA256 cd4cbc5aa3ba94095e85cf026b015f20af9ed77c05b529b2cb902e5ba365a7c3
 MD5 29710cca211a266690d649eff1ffe287 files/libpcap-0.8.1-fPIC.patch 298
 RMD160 4cf97341a5da39c97553871312c9381f30457bdb files/libpcap-0.8.1-fPIC.patch 298
@@ -9,20 +6,24 @@ AUX libpcap-0.9.3-whitespace.diff 679 RMD160 70ccf92874b1665253608ffeffa7de89c2a
 MD5 daf575fe650740e0e4013da7b86f2b50 files/libpcap-0.9.3-whitespace.diff 679
 RMD160 70ccf92874b1665253608ffeffa7de89c2af48d7 files/libpcap-0.9.3-whitespace.diff 679
 SHA256 4ff701485da6f577980048b9b91810ba7aa529c3be021dea30c8205b0a130606 files/libpcap-0.9.3-whitespace.diff 679
+AUX libpcap-cross-linux.patch 1114 RMD160 e76fd1ea94d34e8533416c476d95166ad13579ec SHA1 0853cb1cf102c6d9b41d22b4c62b0e1bac6d73a8 SHA256 4b3fe1e2b7ecefbf82e20120f8c3bf9c5050cb7ccc1e0be77a04af5ef7cbb459
+MD5 6995057db8461f8b7a04cfcf1ed90679 files/libpcap-cross-linux.patch 1114
+RMD160 e76fd1ea94d34e8533416c476d95166ad13579ec files/libpcap-cross-linux.patch 1114
+SHA256 4b3fe1e2b7ecefbf82e20120f8c3bf9c5050cb7ccc1e0be77a04af5ef7cbb459 files/libpcap-cross-linux.patch 1114
 DIST libpcap-0.9.4.tar.gz 425887 RMD160 b8adee8f40256b8822e8e8b7da9a9bbd716ff6ab SHA1 046f7624e66da51eba1ed2cb169695d1e7f31c29 SHA256 379cf6a5b4a68d9cb9431c018a3402196547cba36ffc958927cacd038cb50c60
 DIST libpcap-0.9.5.tar.gz 433207 RMD160 272a167881ad05dddd5a1095b0f64f3ecd845bdc SHA1 3a3b0821f7201b4a72201c69ca2411a3db8a83c3 SHA256 6a6568bc082c266864687674707628d1531e86cffad439af72b865ac3169c322
 EBUILD libpcap-0.9.4.ebuild 1537 RMD160 2a8e2c5c898dd4119217006145b60965345e74ad SHA1 9a7e0f1f5154e87ffaee831bb990448abd3129bd SHA256 fab4e0c54b3e6ffbf2743c6905f2a1b84e828654efb2acecab768c737e8c91ab
 MD5 ebf49e31d3f5b853cf19c469a1854082 libpcap-0.9.4.ebuild 1537
 RMD160 2a8e2c5c898dd4119217006145b60965345e74ad libpcap-0.9.4.ebuild 1537
 SHA256 fab4e0c54b3e6ffbf2743c6905f2a1b84e828654efb2acecab768c737e8c91ab libpcap-0.9.4.ebuild 1537
-EBUILD libpcap-0.9.5.ebuild 1942 RMD160 01e3c9a150af441d8ca48ee129a70e26c46b71d0 SHA1 1e63b965ef5d5ac3108fdce98f2363c29a71fac0 SHA256 354bc928115f75ef2d5b340187ff8ff8e7326f031d05fb5688fecd32079717af
-MD5 10745b0edfd1cfc864464d23e10e46ba libpcap-0.9.5.ebuild 1942
-RMD160 01e3c9a150af441d8ca48ee129a70e26c46b71d0 libpcap-0.9.5.ebuild 1942
-SHA256 354bc928115f75ef2d5b340187ff8ff8e7326f031d05fb5688fecd32079717af libpcap-0.9.5.ebuild 1942
-MISC ChangeLog 8884 RMD160 4b59f5ed629548f6fd303814f9748a7008de4283 SHA1 86cd8449955a2492cf637147c2a071c054d510e6 SHA256 ef206030b722dd027050c36f15c02e1d5afc27b82e01b5b03357baf8a6b3cd1d
-MD5 097f198cd961926325bb563beb17d2cb ChangeLog 8884
-RMD160 4b59f5ed629548f6fd303814f9748a7008de4283 ChangeLog 8884
-SHA256 ef206030b722dd027050c36f15c02e1d5afc27b82e01b5b03357baf8a6b3cd1d ChangeLog 8884
+EBUILD libpcap-0.9.5.ebuild 1620 RMD160 a94cefce7bff42925e2556d0df16ccc9dfbce3db SHA1 e1cbb4fd083ce12588fdfbf6ac9a90d623653110 SHA256 4c09e42d871e8eced2b9bcae1336d5ede29cd8e55ae9f0178728ebdcc1211abd
+MD5 56b92d41f557b8aa0376c2c35e121a5d libpcap-0.9.5.ebuild 1620
+RMD160 a94cefce7bff42925e2556d0df16ccc9dfbce3db libpcap-0.9.5.ebuild 1620
+SHA256 4c09e42d871e8eced2b9bcae1336d5ede29cd8e55ae9f0178728ebdcc1211abd libpcap-0.9.5.ebuild 1620
+MISC ChangeLog 9033 RMD160 e2849ed69446a41e72492fc039df7cf3725d496d SHA1 c906b32aa0ef287e3598250b99dcad768cbf3e3e SHA256 7ebd642c38f6ad82308c739d6ab2c75b0ee1dcd1af3c81d08b17b7a1cdf34633
+MD5 a7c84456481151a3e4ae0241e1371eb5 ChangeLog 9033
+RMD160 e2849ed69446a41e72492fc039df7cf3725d496d ChangeLog 9033
+SHA256 7ebd642c38f6ad82308c739d6ab2c75b0ee1dcd1af3c81d08b17b7a1cdf34633 ChangeLog 9033
 MISC metadata.xml 261 RMD160 5bcf72e234ef387b24ffb9221623eaf927a41f02 SHA1 31a589dbbde4597dc3df248c57b5213889c67423 SHA256 92d6c306fe13ead877997b8ff3007ffa601a1e7c96ca3ec2208f88884a95c791
 MD5 50057505c6cef15415ae8f8ca7378d82 metadata.xml 261
 RMD160 5bcf72e234ef387b24ffb9221623eaf927a41f02 metadata.xml 261
@@ -33,10 +34,3 @@ SHA256 954d67945e47a32789216e0a6d56dacd3fb22058792a287c14211247ed2a1383 files/di
 MD5 e965f78b5afb58927806488a68965496 files/digest-libpcap-0.9.5 241
 RMD160 a084ed5ee6f39dad5f6f94f5dc61edefee2bc4e8 files/digest-libpcap-0.9.5 241
 SHA256 f94ed3fe77513c919962250b684a2a260a16a78c5849ca928074d660ac867b83 files/digest-libpcap-0.9.5 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFGK95gbaW+3NC9cLgRAgILAJ9UP5KuH71wwKocTYNgE6IsDUNxDACfXf6o
-Nn8D7+onGG5wnC/QsmKYwgk=
-=2nvO
------END PGP SIGNATURE-----
diff --git a/net-libs/libpcap/files/libpcap-cross-linux.patch b/net-libs/libpcap/files/libpcap-cross-linux.patch
new file mode 100644
index 000000000000..8d21868018dd
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-cross-linux.patch
@@ -0,0 +1,27 @@
+diff -ru libpcap-0.9.5~/configure.in libpcap-0.9.5/configure.in
+--- libpcap-0.9.5~/configure.in	2007-05-05 12:43:21.000000000 +0200
++++ libpcap-0.9.5/configure.in	2007-05-05 12:43:41.000000000 +0200
+@@ -178,7 +178,10 @@
+ dnl XXX This could be done for cross-compiling, but for now it's not.
+ dnl
+ if test -z "$with_pcap" && test "$cross_compiling" = yes; then
+-	AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...)
++	case $host in
++	*-linux*) with_pcap="linux";;
++	*) AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...);;
++	esac
+ fi
+ AC_ARG_WITH(pcap, [  --with-pcap=TYPE        use packet capture TYPE])
+ AC_MSG_CHECKING(packet capture type)
+@@ -347,8 +350,10 @@
+ linux)
+ 	AC_MSG_CHECKING(Linux kernel version)
+  	if test "$cross_compiling" = yes; then
++		dnl we could check linux/version.h here, but who runs
++		dnl versions of linux older than 2.0.x anymore to bother ?
+  		AC_CACHE_VAL(ac_cv_linux_vers,
+- 		    ac_cv_linux_vers=unknown)
++ 		    ac_cv_linux_vers=2)
+  	else
+  		AC_CACHE_VAL(ac_cv_linux_vers,
+  		    ac_cv_linux_vers=`uname -r 2>&1 | \
diff --git a/net-libs/libpcap/libpcap-0.9.5.ebuild b/net-libs/libpcap/libpcap-0.9.5.ebuild
index fae62215a1d9..e95888b59030 100644
--- a/net-libs/libpcap/libpcap-0.9.5.ebuild
+++ b/net-libs/libpcap/libpcap-0.9.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-0.9.5.ebuild,v 1.12 2007/04/22 22:14:42 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-0.9.5.ebuild,v 1.13 2007/05/05 10:52:19 cedk Exp $
 
-inherit eutils multilib toolchain-funcs
+inherit autotools eutils multilib toolchain-funcs
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
 HOMEPAGE="http://www.tcpdump.org/"
@@ -21,24 +21,12 @@ src_unpack() {
 	unpack ${A}; cd "${S}"
 	epatch "${FILESDIR}"/${PN}-0.9.3-whitespace.diff
 	epatch "${FILESDIR}"/${PN}-0.8.1-fPIC.patch
+	epatch "${FILESDIR}"/${PN}-cross-linux.patch
+	eautoreconf
 }
 
 src_compile() {
-	MY_OPTS=""
-	if tc-is-cross-compiler; then
-		if [[ "${LIBPCAP_PCAP}" == "linux" ]]; then
-			MY_OPTS="--with-pcap=linux"
-		elif [[ "${LIBPCAP_PCAP}" == "bpf" ]]; then
-			MY_OPTS="--with-pcap=bpf"
-		else
-			eerror "When cross compile, you must set"
-			eerror "the env variable to one of these values:"
-			eerror " linux"
-			eerror " bpf"
-			die "LIBPCAP_PCAP is not set"
-		fi
-	fi
-	econf $(use_enable ipv6) ${MY_OPTS} || die "bad configure"
+	econf $(use_enable ipv6) || die "bad configure"
 	emake || die "compile problem"
 
 	# no provision for this in the Makefile, so...