NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "package/daq3: fix build without threads"

Browse Source 
This reverts commit 7c8641e5a9 as threads
are also used by afpacket and bpf modules if libpcap is found.

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2021-07-27 10:01:14 +02:00 committed by Thomas Petazzoni
parent be76508af2
commit 7b103c50eb
2 changed files with 1 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
package/daq3/0001-add-disable-example.patch
View File

@ -1,49 +0,0 @@
From 1d7031dde8da39cd2151f87d68dddea91f304603 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sat, 19 Jun 2021 11:31:35 +0200
Subject: [PATCH] add --disable-example
Add --disable-example to be able to build daq on toolchains without
threads support
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/snort3/libdaq/pull/13]
---
Makefile.am | 5 ++++-
configure.ac | 5 +++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index dcba62b..0a79319 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,9 @@ pkgconfig_DATA = libdaq.pc
if BUILD_MODULES
MODULES_DIR = modules
endif
-SUBDIRS = api $(MODULES_DIR) example test
+SUBDIRS = api $(MODULES_DIR) test
+if BUILD_EXAMPLE
+ SUBDIRS += example
+endif
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 23b38a2..36a09ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,6 +274,11 @@ AM_CONDITIONAL([BUILD_MODULES], [test "$enable_afpacket_module" = yes -o \
LIBS=${save_LIBS}
+AC_ARG_ENABLE(example,
+ AS_HELP_STRING([--disable-example],[do not build the example]),
+ [enable_example="$enableval"], [enable_example=yes])
+AM_CONDITIONAL([BUILD_EXAMPLE], [test "$enable_example" = yes])
+
AC_CHECK_LIB([dl], [dlopen], [LIBDL="-ldl"])
AM_CONDITIONAL([BUILD_SHARED_MODULES], [ test "$enable_shared" = yes ])
--
2.30.2

3
package/daq3/daq3.mk
View File

@ -12,7 +12,6 @@ DAQ3_INSTALL_STAGING = YES
DAQ3_DEPENDENCIES = host-pkgconf
# From git
DAQ3_AUTORECONF = YES
DAQ3_CONF_OPTS = --disable-example
ifeq ($(BR2_PACKAGE_LIBNETFILTER_QUEUE),y)
DAQ3_DEPENDENCIES += libnetfilter_queue
@ -21,7 +20,7 @@ else
DAQ3_CONF_OPTS += --disable-nfq-module
endif
ifeq ($(BR2_PACKAGE_LIBPCAP)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
ifeq ($(BR2_PACKAGE_LIBPCAP),y)
DAQ3_DEPENDENCIES += libpcap
DAQ3_CONF_OPTS += --enable-pcap-module
else