Skip to contentSkip to conversation

daq: libpcap is optional not mandatory

PATCH New Fabrice Fontaine 2 participants 2 messages Jan 4, 2018 – Jan 6, 2018

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH v2 1/1 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 <[email protected]>

---
Changes v1 -> v2 (after review of Baruch Siach):
- Change DAQ_CONF_ENV assignment from = to += as it is now in a ifeq
statement to avoid issues later when someone will want to update DAQ_CONF_ENV before this ifeq statement

 package/daq/Config.in |  1 -
 package/daq/daq.mk    | 12 ++++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)
package/daq/Config.in +0 -1
index 7800061642..1d24c6d11a 100644
@@ -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
package/daq/daq.mk +10 -2
index c4b4c881f1..15ddcc9763 100644
@@ -10,16 +10,24 @@ 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))
Signature · 1 line
2.14.1
Applied
#1 lore raw

PATCH v2 1/1 daq: libpcap is optional not mandatory

Hello,

Quoted 10 lines · Fabrice Fontaine

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 <[email protected]>

---
Changes v1 -> v2 (after review of Baruch Siach):
- Change DAQ_CONF_ENV assignment from = to += as it is now in a ifeq
statement to avoid issues later when someone will want to update DAQ_CONF_ENV before this ifeq statement

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com