From 2a314eb41b2ad046d9cf7f21934e877fef4437ed Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 23 Jan 2013 18:29:44 -0800 Subject: 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 Signed-off-by: Richard Purdie --- ...-The-leading-comma-looked-weird-remove-it.patch | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch (limited to 'meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch') 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 @@ +Upstream-Status: Backport + +From fffa60a0693182085a7d4351150137eda26dbf82 Mon Sep 17 00:00:00 2001 +From: Guy Harris +Date: Wed, 13 Jun 2012 12:20:19 -0700 +Subject: [PATCH] The leading comma looked weird; remove it. + +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 +that sort. +--- + configure.in | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index d8554ca..ba5b64e 100644 +--- a/configure.in ++++ b/configure.in +@@ -1371,7 +1371,8 @@ AC_SUBST(NETFILTER_SRC) + + AC_ARG_ENABLE([bluetooth], + [AC_HELP_STRING([--enable-bluetooth],[enable Bluetooth support @<:@default=yes, if support available@:>@])], +-,enable_bluetooth=yes) ++ [], ++ [enable_bluetooth=yes]) + + if test "x$enable_bluetooth" != "xno" ; then + dnl check for Bluetooth sniffing support +@@ -1396,7 +1397,8 @@ fi + + AC_ARG_ENABLE([canusb], + [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 + dnl check for canusb support +@@ -1422,7 +1424,8 @@ fi + + AC_ARG_ENABLE([can], + [AC_HELP_STRING([--enable-can],[enable CAN support @<:@default=yes, if support available@:>@])], +-,enable_can=yes) ++ [], ++ [enable_can=yes]) + + if test "x$enable_can" != "xno" ; then + dnl check for CAN sniffing support +-- +1.7.9.5 + -- cgit v1.2.3-54-g00ecf