libpcap: Fix up patches
These patches where tweaking both configure.in and configure, which is bad since configure changes after an autoconf. If the patch is re-applied for some reason it would notice that it's already appiled and fails. [YOCTO #4314] (From OE-Core rev: c32b425c10566cf2aaf187e98b6e2e29022bea2f) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
ac5b5bedfa
commit
17800b5a26
File diff suppressed because it is too large
Load Diff
|
@ -8,14 +8,17 @@ Subject: [PATCH] The leading comma looked weird; remove it.
|
||||||
That might be how the --disable-canusb bug got in. Hopefully this will
|
That might be how the --disable-canusb bug got in. Hopefully this will
|
||||||
make the code look a little clearer and possibly avoid future bugs of
|
make the code look a little clearer and possibly avoid future bugs of
|
||||||
that sort.
|
that sort.
|
||||||
|
|
||||||
|
sgw - Cleaned up the patch based on another patch
|
||||||
|
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||||
---
|
---
|
||||||
configure.in | 9 ++++++---
|
configure.in | 9 ++++++---
|
||||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/configure.in b/configure.in
|
Index: libpcap-1.3.0/configure.in
|
||||||
index d8554ca..ba5b64e 100644
|
===================================================================
|
||||||
--- a/configure.in
|
--- libpcap-1.3.0.orig/configure.in
|
||||||
+++ b/configure.in
|
+++ libpcap-1.3.0/configure.in
|
||||||
@@ -1371,7 +1371,8 @@ AC_SUBST(NETFILTER_SRC)
|
@@ -1371,7 +1371,8 @@ AC_SUBST(NETFILTER_SRC)
|
||||||
|
|
||||||
AC_ARG_ENABLE([bluetooth],
|
AC_ARG_ENABLE([bluetooth],
|
||||||
|
@ -26,17 +29,20 @@ index d8554ca..ba5b64e 100644
|
||||||
|
|
||||||
if test "x$enable_bluetooth" != "xno" ; then
|
if test "x$enable_bluetooth" != "xno" ; then
|
||||||
dnl check for Bluetooth sniffing support
|
dnl check for Bluetooth sniffing support
|
||||||
@@ -1396,7 +1397,8 @@ fi
|
@@ -1395,8 +1396,10 @@ if test "x$enable_bluetooth" != "xno" ;
|
||||||
|
fi
|
||||||
|
|
||||||
AC_ARG_ENABLE([canusb],
|
AC_ARG_ENABLE([canusb],
|
||||||
[AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])],
|
-[AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])]
|
||||||
-,enable_canusb=yes)
|
-,enable_canusb=yes)
|
||||||
|
+[AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])],
|
||||||
+ [],
|
+ [],
|
||||||
+ [enable_canusb=yes])
|
+ [enable_canusb=yes])
|
||||||
|
+
|
||||||
|
|
||||||
if test "x$enable_canusb" != "xno" ; then
|
if test "x$enable_canusb" != "xno" ; then
|
||||||
dnl check for canusb support
|
dnl check for canusb support
|
||||||
@@ -1422,7 +1424,8 @@ fi
|
@@ -1422,7 +1425,8 @@ fi
|
||||||
|
|
||||||
AC_ARG_ENABLE([can],
|
AC_ARG_ENABLE([can],
|
||||||
[AC_HELP_STRING([--enable-can],[enable CAN support @<:@default=yes, if support available@:>@])],
|
[AC_HELP_STRING([--enable-can],[enable CAN support @<:@default=yes, if support available@:>@])],
|
||||||
|
@ -46,6 +52,3 @@ index d8554ca..ba5b64e 100644
|
||||||
|
|
||||||
if test "x$enable_can" != "xno" ; then
|
if test "x$enable_can" != "xno" ; then
|
||||||
dnl check for CAN sniffing support
|
dnl check for CAN sniffing support
|
||||||
--
|
|
||||||
1.7.9.5
|
|
||||||
|
|
||||||
|
|
|
@ -7,24 +7,13 @@ Subject: [PATCH] canusb: needs -lpthread
|
||||||
|
|
||||||
canusb uses pthreads, but -lpthread is never added to LIBS hence missing
|
canusb uses pthreads, but -lpthread is never added to LIBS hence missing
|
||||||
from pcap-config, causing build failures. Fix this.
|
from pcap-config, causing build failures. Fix this.
|
||||||
|
|
||||||
|
sgw - Removed configure part of the patch since it could change
|
||||||
|
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||||
---
|
---
|
||||||
configure | 2 +-
|
|
||||||
configure.in | 2 +-
|
configure.in | 2 +-
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/configure b/configure
|
|
||||||
index 1368ac5..24587c8 100755
|
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -11529,7 +11529,7 @@ cat >>confdefs.h <<\_ACEOF
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
CANUSB_SRC=pcap-canusb-linux.c
|
|
||||||
- LIBS="-lusb-1.0 $LIBS"
|
|
||||||
+ LIBS="-lusb-1.0 -lpthread $LIBS"
|
|
||||||
{ echo "$as_me:$LINENO: canusb sniffing is supported" >&5
|
|
||||||
echo "$as_me: canusb sniffing is supported" >&6;}
|
|
||||||
|
|
||||||
diff --git a/configure.in b/configure.in
|
diff --git a/configure.in b/configure.in
|
||||||
index ba5b64e..47e0b70 100644
|
index ba5b64e..47e0b70 100644
|
||||||
--- a/configure.in
|
--- a/configure.in
|
||||||
|
|
Loading…
Reference in New Issue