summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2009-07-08 13:29:06 +0000
committerPeter Volkov <pva@gentoo.org>2009-07-08 13:29:06 +0000
commit89cc1938826255c4ab4ae4ecf2cc8fadc006a752 (patch)
tree122294b588a09b302cfaf87a2ebae73e761ca8ae /net-libs/libpcap/files
parentAdd ~mips keywords to KDE 3.5.10 (diff)
downloadgentoo-2-89cc1938826255c4ab4ae4ecf2cc8fadc006a752.tar.gz
gentoo-2-89cc1938826255c4ab4ae4ecf2cc8fadc006a752.tar.bz2
gentoo-2-89cc1938826255c4ab4ae4ecf2cc8fadc006a752.zip
Version bump, fixes 100% cpu usage, bug #275257, thank Michael O'Brien for report. Remove affected version.
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'net-libs/libpcap/files')
-rw-r--r--net-libs/libpcap/files/libpcap-1.0.1_pre20090708-libnl-automagic.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/net-libs/libpcap/files/libpcap-1.0.1_pre20090708-libnl-automagic.patch b/net-libs/libpcap/files/libpcap-1.0.1_pre20090708-libnl-automagic.patch
new file mode 100644
index 000000000000..1895dbe576ad
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.0.1_pre20090708-libnl-automagic.patch
@@ -0,0 +1,36 @@
+commit e61f27f56bef0f229f0bf02911f76cfcfa12f083
+Author: Peter Volkov <pva@gentoo.org>
+Date: Wed Jul 8 16:06:18 2009 +0400
+
+ Add --without-libnl configure switch
+
+ Allow build libpcap with libnl disabled even in case libnl is installed
+ at system.
+
+diff --git a/configure.in b/configure.in
+index 88a71ef..397a9c7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -437,9 +437,19 @@ linux)
+ #
+ # Do we have libnl?
+ #
+- AC_CHECK_LIB(nl, nl_handle_alloc,
+- LIBS="-lnl $LIBS"
+- AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]),)
++ AC_ARG_WITH(libnl,
++ AC_HELP_STRING([--without-libnl],[disable libnl support @<:@default=yes, on Linux, if present@:>@]),
++ with_libnl=$withval,,)
++
++ if test x$with_libnl != xno ; then
++ AC_CHECK_LIB(nl, nl_handle_alloc,
++ LIBS="-lnl $LIBS"
++ AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]),
++ if test x$with_libnl = xyes ; then
++ AC_MSG_ERROR([libnl support requested but libnl not found])
++ fi
++ )
++ fi
+
+ AC_LBL_TPACKET_STATS
+ AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI