diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2013-04-26 16:04:37 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-29 14:43:53 +0100 |
| commit | c32b425c10566cf2aaf187e98b6e2e29022bea2f (patch) | |
| tree | 5e2382842afedde4612e0f03dfdb4dd48756a01f /meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch | |
| parent | 7317c8055cf3af8912a66badb3074f0a60f75ec2 (diff) | |
| download | openembedded-core-contrib-c32b425c10566cf2aaf187e98b6e2e29022bea2f.tar.gz | |
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]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch')
| -rw-r--r-- | meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch index 94788aa3c4..e7456b799b 100644 --- a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch +++ b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch @@ -7,24 +7,13 @@ Subject: [PATCH] canusb: needs -lpthread canusb uses pthreads, but -lpthread is never added to LIBS hence missing 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 +- 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 index ba5b64e..47e0b70 100644 --- a/configure.in |