From: Gustavo Zacarias Date: Mon, 4 Aug 2014 01:38:49 +0000 (-0300) Subject: libpcap: handle bluetooth explicitly X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=20cb1b90565abab87d950e7ed4d33cb2239c86dc;p=buildroot.git libpcap: handle bluetooth explicitly If bluez_utils is around then add it to dependencies so as to use it, but if it's not (for instance bluez5_utils is around) then disable it since the bluez5 API isn't compatible. Fixes: http://autobuild.buildroot.net/results/6ca/6caeb7f41ac5e14dbee49f87511af3351f6013f1/ Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index a8c056ea3d..7cf731eb86 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -20,6 +20,13 @@ LIBPCAP_CFLAGS = $(TARGET_CFLAGS) LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux LIBPCAP_CONFIG_SCRIPTS = pcap-config +# On purpose, not compatible with bluez5 +ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) +LIBPCAP_DEPENDENCIES += bluez_utils +else +LIBPCAP_CONF_OPT += --disable-bluetooth +endif + ifeq ($(BR2_PACKAGE_DBUS),y) LIBPCAP_CONF_OPT += --enable-dbus LIBPCAP_DEPENDENCIES += dbus