From 28ccc22ffd3d2fa8844f4572e14e32875c4ccd49 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 9 Dec 2009 14:00:55 +0100 Subject: libpcap: fix wireless handling Based on ba23aa7b in libpcap upstream. linux/wireless.h includes linux/if.h, which conflicts with net/if.h as they both define if* structures. Fix build by simply using linux/if.h instead of net/if.h. The same fix should be done for the configure script, but cheat by presetting it instead. This fix in turn fixes kismet build with BR2_CONFIG_CACHE enabled, as that uses the same ac_cv_linux_wireless_h cache value. Signed-off-by: Peter Korsgaard --- package/libpcap/libpcap.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package/libpcap/libpcap.mk') diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index dc72924e9..801b15e08 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -14,7 +14,8 @@ LIBPCAP_INSTALL_TARGET_OPT= DESTDIR="$(TARGET_DIR)" \ LIBPCAP_INSTALL_STAGING_OPT= DESTDIR="$(STAGING_DIR)" install \ $(if $(BR2_PREFER_STATIC_LIB),,install-shared) LIBPCAP_DEPENDENCIES:=zlib -LIBPCAP_CONF_ENV:=ac_cv_linux_vers=$(firstword $(subst .,$(space),$(firstword $(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS))))) +LIBPCAP_CONF_ENV:=ac_cv_linux_vers=$(firstword $(subst .,$(space),$(firstword $(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS))))) \ + ac_cv_header_linux_wireless_h=yes # configure misdetects this LIBPCAP_CONF_OPT:=--disable-yydebug --with-pcap=linux $(eval $(call AUTOTARGETS,package,libpcap)) -- cgit v1.2.3