summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-01-23 18:29:44 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-25 14:36:16 +0000
commit2a314eb41b2ad046d9cf7f21934e877fef4437ed (patch)
treea1286176fd7c2c25f23497229b45d12604aae0fe /meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch
parent5916dcc1f357a624ecaa7cf9a4071fbf00447512 (diff)
downloadpoky-2a314eb41b2ad046d9cf7f21934e877fef4437ed.tar.gz
libpcap: Turn canusb support into PACKAGECONFIG
libpcap notices libusb in its configure if its sysrooted and ignores it if its not. But this causes problems since there is no explicit dependency on libusb. Rebuild from shared state sometimes fails when libusb has not been yet populated in sysroot and libpcap has. And do_configure of consumers of libpcap e.g. tcpdump are probing for features on libpcap. All the tests fail since none of link steps succeed and it sees as if libpcap does not have required features and configure of tcpdump bails out. turn canusb into PACKAGECONFIG and let it be disabled by default. Backport additional patches needed for disable-canusb to work (From OE-Core rev: a7cfc0ce9885c51ccefcaba001e6672d7b3e36e5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch')
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch
new file mode 100644
index 0000000000..06ca275b18
--- /dev/null
+++ b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch
@@ -0,0 +1,51 @@
1Upstream-Status: Backport
2
3From fffa60a0693182085a7d4351150137eda26dbf82 Mon Sep 17 00:00:00 2001
4From: Guy Harris <guy@alum.mit.edu>
5Date: Wed, 13 Jun 2012 12:20:19 -0700
6Subject: [PATCH] The leading comma looked weird; remove it.
7
8That might be how the --disable-canusb bug got in. Hopefully this will
9make the code look a little clearer and possibly avoid future bugs of
10that sort.
11---
12 configure.in | 9 ++++++---
13 1 file changed, 6 insertions(+), 3 deletions(-)
14
15diff --git a/configure.in b/configure.in
16index d8554ca..ba5b64e 100644
17--- a/configure.in
18+++ b/configure.in
19@@ -1371,7 +1371,8 @@ AC_SUBST(NETFILTER_SRC)
20
21 AC_ARG_ENABLE([bluetooth],
22 [AC_HELP_STRING([--enable-bluetooth],[enable Bluetooth support @<:@default=yes, if support available@:>@])],
23-,enable_bluetooth=yes)
24+ [],
25+ [enable_bluetooth=yes])
26
27 if test "x$enable_bluetooth" != "xno" ; then
28 dnl check for Bluetooth sniffing support
29@@ -1396,7 +1397,8 @@ fi
30
31 AC_ARG_ENABLE([canusb],
32 [AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])],
33-,enable_canusb=yes)
34+ [],
35+ [enable_canusb=yes])
36
37 if test "x$enable_canusb" != "xno" ; then
38 dnl check for canusb support
39@@ -1422,7 +1424,8 @@ fi
40
41 AC_ARG_ENABLE([can],
42 [AC_HELP_STRING([--enable-can],[enable CAN support @<:@default=yes, if support available@:>@])],
43-,enable_can=yes)
44+ [],
45+ [enable_can=yes])
46
47 if test "x$enable_can" != "xno" ; then
48 dnl check for CAN sniffing support
49--
501.7.9.5
51