From 60f492040aa6f0c5d50acb0cb315c111065ac307 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 4 Jan 2018 20:17:39 +0100 Subject: [PATCH] daq: libpcap is optional not mandatory daq can be compiled without libpcap thanks to --enable-pcap-module and --disable-pcap-module options. libpcap is just a mandadory dependency of snort. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/daq/Config.in | 1 - package/daq/daq.mk | 10 ++++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/daq/Config.in b/package/daq/Config.in index 7800061642..1d24c6d11a 100644 --- a/package/daq/Config.in +++ b/package/daq/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_DAQ bool "daq" depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBDNET help DAQ is a Data Acquisition library for packet I/O from the diff --git a/package/daq/daq.mk b/package/daq/daq.mk index c4b4c881f1..4499fb4b68 100644 --- a/package/daq/daq.mk +++ b/package/daq/daq.mk @@ -10,16 +10,22 @@ DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz DAQ_LICENSE = GPL-2.0 DAQ_LICENSE_FILES = COPYING DAQ_INSTALL_STAGING = YES -DAQ_DEPENDENCIES = libpcap libdnet +DAQ_DEPENDENCIES = libdnet # package does not build in parallel due to improper make rules # related to the generation of the tokdefs.h header file DAQ_MAKE = $(MAKE1) +ifeq ($(BR2_PACKAGE_LIBPCAP),y) +DAQ_DEPENDENCIES += libpcap # assume these flags are available to prevent configure from running # test programs while cross compiling -DAQ_CONF_ENV = \ +DAQ_CONF_ENV += \ ac_cv_lib_pcap_pcap_lib_version=yes \ daq_cv_libpcap_version_1x=yes +DAQ_CONF_OPTS += --enable-pcap-module +else +DAQ_CONF_OPTS += --disable-pcap-module +endif $(eval $(autotools-package)) -- 2.30.2