[Buildroot] [git commit branch/next] Revert "package/daq3: fix build without threads"
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: 2021-08-04 00:49:21
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=7b103c50eb3eaddad4ea81b9cd0c7deee1d9d9d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This reverts commit 7c8641e5a97b89c14aebd730772e9cc037de6ccc as threads are also used by afpacket and bpf modules if libpcap is found. Signed-off-by: Fabrice Fontaine <redacted> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> --- package/daq3/0001-add-disable-example.patch | 49 ----------------------------- package/daq3/daq3.mk | 3 +- 2 files changed, 1 insertion(+), 51 deletions(-)
diff --git a/package/daq3/0001-add-disable-example.patch b/package/daq3/0001-add-disable-example.patch
deleted file mode 100644
index c126e32859..0000000000
--- a/package/daq3/0001-add-disable-example.patch
+++ /dev/null@@ -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 -
diff --git a/package/daq3/daq3.mk b/package/daq3/daq3.mk
index b726031d39..1de7e53a79 100644
--- a/package/daq3/daq3.mk
+++ b/package/daq3/daq3.mk@@ -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
_______________________________________________ buildroot mailing list buildroot@busybox.net http://lists.busybox.net/mailman/listinfo/buildroot