[Buildroot] [PATCH 1/2] Revert "package/daq3: fix build without threads"

[Buildroot] [PATCH 1/2] Revert "package/daq3: fix build without threads"

[Fabrice Fontaine]

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/daq3/0001-add-disable-example.patch | 49 ---------------------
 package/daq3/daq3.mk                        |  3 +-
 2 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 package/daq3/0001-add-disable-example.patch

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
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/daq3: needs threads

[Fabrice Fontaine]

daq3 depends on threads since its addition in commit
6e75a990ae35580800f24f3ddc4573c6bc38fa05

Fixes:
 - http://autobuild.buildroot.org/results/b56defe97c0bd56d9a887beeb183ed9bb660b72a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/daq3/Config.in   | 6 ++++--
 package/snort3/Config.in | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package/daq3/Config.in b/package/daq3/Config.in
index ad7d55db5b..b53e5508fd 100644
--- a/package/daq3/Config.in
+++ b/package/daq3/Config.in
@@ -3,12 +3,14 @@ config BR2_PACKAGE_DAQ3
 	depends on !BR2_PACKAGE_DAQ
 	depends on !BR2_STATIC_LIBS # dlfcn.h
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  DAQ is a Data Acquisition library for packet I/O from the
 	  Snort project.
 
 	  https://www.snort.org
 
-comment "daq3 needs a toolchain w/ dynamic library, gcc >= 4.9"
+comment "daq3 needs a toolchain w/ dynamic library, gcc >= 4.9, threads"
 	depends on !BR2_PACKAGE_DAQ
-	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \
+		|| !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/snort3/Config.in b/package/snort3/Config.in
index 75923c3c20..dcc29b820a 100644
--- a/package/snort3/Config.in
+++ b/package/snort3/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_SNORT3
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_STATIC_LIBS # daq3
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11
-	depends on BR2_TOOLCHAIN_HAS_THREADS # hwloc
+	depends on BR2_TOOLCHAIN_HAS_THREADS # daq3, hwloc
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_DAQ3
 	select BR2_PACKAGE_FLEX
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] Revert "package/daq3: fix build without threads"

[Thomas Petazzoni]

On Tue, 27 Jul 2021 10:01:14 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> This reverts commit 7c8641e5a97b89c14aebd730772e9cc037de6ccc as threads
> are also used by afpacket and bpf modules if libpcap is found.
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/daq3/0001-add-disable-example.patch | 49 ---------------------
>  package/daq3/daq3.mk                        |  3 +-
>  2 files changed, 1 insertion(+), 51 deletions(-)
>  delete mode 100644 package/daq3/0001-add-disable-example.patch

Both applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot