summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-11-24 23:09:27 +0000
committerMike Frysinger <vapier@gentoo.org>2009-11-24 23:09:27 +0000
commit5680a94d0285a3a9dda44cf7bda102062e5c7d3c (patch)
tree11b085824ab7f4a668c8a56ea7a82efb518e2f73 /net-libs/libpcap
parentUpdate homepage (diff)
downloadgentoo-2-5680a94d0285a3a9dda44cf7bda102062e5c7d3c.tar.gz
gentoo-2-5680a94d0285a3a9dda44cf7bda102062e5c7d3c.tar.bz2
gentoo-2-5680a94d0285a3a9dda44cf7bda102062e5c7d3c.zip
Fix building with autoconf-2.64+ #281690.
(Portage version: 2.2_rc51/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/libpcap')
-rw-r--r--net-libs/libpcap/ChangeLog6
-rw-r--r--net-libs/libpcap/files/libpcap-1.0.1-autoconf.patch17
-rw-r--r--net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild3
3 files changed, 24 insertions, 2 deletions
diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index ea15f2683116..52f6a79b2922 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/libpcap
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.131 2009/10/12 09:03:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.132 2009/11/24 23:09:26 vapier Exp $
+
+ 24 Nov 2009; Mike Frysinger <vapier@gentoo.org>
+ libpcap-1.0.1_pre20090812.ebuild, +files/libpcap-1.0.1-autoconf.patch:
+ Fix building with autoconf-2.64+ #281690.
12 Oct 2009; Jeroen Roovers <jer@gentoo.org> libpcap-1.0.0-r2.ebuild:
Stable for HPPA (bug #284790).
diff --git a/net-libs/libpcap/files/libpcap-1.0.1-autoconf.patch b/net-libs/libpcap/files/libpcap-1.0.1-autoconf.patch
new file mode 100644
index 000000000000..5d5598fbb33a
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.0.1-autoconf.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/281690
+https://sourceforge.net/tracker/index.php?func=detail&aid=2881185&group_id=53067&atid=469577
+
+the code before AC_PROG_CC isnt terribly important, so ignore it for now so
+that we work with autoconf-2.64+
+
+--- libpcap/aclocal.m4
++++ libpcap/aclocal.m4
+@@ -44,7 +44,7 @@
+ dnl
+ AC_DEFUN(AC_LBL_C_INIT,
+ [AC_PREREQ(2.12)
+- AC_BEFORE([$0], [AC_PROG_CC])
++ AC_REQUIRE([AC_PROG_CC])
+ AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
+ AC_BEFORE([$0], [AC_LBL_DEVEL])
+ AC_ARG_WITH(gcc, [ --without-gcc don't use gcc])
diff --git a/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild b/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild
index 462029c15b13..e4f50b829967 100644
--- a/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild
+++ b/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild,v 1.1 2009/08/29 21:06:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild,v 1.2 2009/11/24 23:09:26 vapier Exp $
EAPI=2
inherit autotools eutils multilib toolchain-funcs
@@ -28,6 +28,7 @@ PROVIDE="virtual/libpcap"
src_prepare() {
epatch "${FILESDIR}/${PN}-1.0.0-cross-linux.patch"
epatch "${FILESDIR}/${PN}-1.0.1_pre20090812-poll-cpu-usage.patch"
+ epatch "${FILESDIR}"/${PN}-1.0.1-autoconf.patch #281690
echo ${PV} > VERSION # Avoid CVS in version
eautoreconf
}