From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 6 Dec 2012 17:41:52 +0000 (-0800)
Subject: libpcap: fix canusb related build issue
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e63dcf20e2e457534346b144b32a2c4abe469a29;p=buildroot.git

libpcap: fix canusb related build issue

Fixes http://autobuild.buildroot.net/results/1b57e479a643df11ea3b20f848085af4ef40799b

The libusb auto detection oddly enough succeeds, even though libusb isn't
available. Fix it by explicitly enabling/disabling canusb support.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---

diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index d35c22824b..7e68f5136d 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -20,12 +20,18 @@ LIBPCAP_INSTALL_STAGING = YES
 # configure script correctly handles --enable-shared/--disable-shared.
 LIBPCAP_AUTORECONF = YES
 
-LIBPCAP_DEPENDENCIES = zlib \
-	$(if $(BR2_PACKAGE_LIBUSB),libusb)
+LIBPCAP_DEPENDENCIES = zlib
 LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
 		ac_cv_header_linux_wireless_h=yes # configure misdetects this
 LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
 
+ifeq ($(BR2_PACKAGE_LIBUSB),y)
+LIBPCAP_CONF_OPT += --enable-canusb
+LIBPCAP_DEPENDENCIES += libusb
+else
+LIBPCAP_CONF_OPT += --disable-canusb
+endif
+
 # microblaze needs -fPIC instead of -fpic
 ifeq ($(BR2_microblaze),y)
 LIBPCAP_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC"