package/daq: fix parallel build
PATCH 1/3 package/daq: fix parallel build
--- package/daq/0002-parallel-grammar.patch | 29 +++++++++++++++++++++++++ package/daq/daq.mk | 6 ++--- 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 package/daq/0002-parallel-grammar.patch
package/daq/0002-parallel-grammar.patch new file +29 -0
@@ -0,0 +1,29 @@ +Fix parallel build + +https://bugs.gentoo.org/673390 + +Downloaded from +https://gitweb.gentoo.org/repo/gentoo.git/tree/net-libs/daq/files/daq-2.0.6-parallel-grammar.patch + +Patch was sent upstream: https://seclists.org/snort/2014/q3/1016 + +Signed-off-by: Bernd Kuhls <[email protected]> + +--- a/sfbpf/Makefile.am ++++ b/sfbpf/Makefile.am +@@ -43,13 +43,14 @@ + libsfbpf_la_LDFLAGS = -version-info 0:1:0 @XCCFLAGS@ + + # use of $@ and $< here is a GNU idiom that borks BSD +-sf_scanner.c: $(srcdir)/scanner.l ++sf_scanner.c: $(srcdir)/scanner.l tokdefs.h + @rm -f $(srcdir)/sf_scanner.c + $(srcdir)/runlex.sh $(V_LEX) -osf_scanner.c $(srcdir)/scanner.l + + sf_scanner.o: sf_scanner.c tokdefs.h + + tokdefs.h: sf_grammar.c ++ + sf_grammar.c: $(srcdir)/grammar.y + @rm -f sf_grammar.c tokdefs.h + $(V_YACC) -d $(srcdir)/grammar.y
package/daq/daq.mk +2 -4
@@ -10,10 +10,8 @@ DAQ_LICENSE = GPL-2.0 DAQ_LICENSE_FILES = COPYING DAQ_INSTALL_STAGING = YES DAQ_DEPENDENCIES = host-bison host-flex - -# package does not build in parallel due to improper make rules -# related to the generation of the tokdefs.h header file -DAQ_MAKE = $(MAKE1) +# 0002-parallel-grammar.patch +DAQ_AUTORECONF = YES # disable ipq module as libipq is deprecated DAQ_CONF_OPTS += --disable-ipq-module
Signature · 1 line
2.25.0
PATCH 2/3 package/daq: bump version to 2.0.7
Added md5 hash provided by upstream.
---
Please note that building this version without autoreconf is broken on my system in contrast to version 2.0.6, reason unknown after comparing the source code of both versions. The configure script is re-run during build causing an error because of variables missing at this stage in DAQ_CONF_ENV to fix libpcap detection. Running autoreconf fixes this problem so I took the freedom to add the parallel build fix used by Gentoo in this series to save some build time again.
package/daq/daq.hash | 4 +++- package/daq/daq.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
package/daq/daq.hash +3 -1
@@ -1,5 +1,7 @@ +# From https://www.snort.org/downloads/snort/md5s +md5 ea796f001d1b00302e4e69e337ab2460 daq-2.0.7.tar.gz # Locally computed: -sha256 d41da5f7793e66044e6927dd868c0525e7ee4ec1a3515bf74ef9a30cd9273af0 daq-2.0.6.tar.gz +sha256 bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13a7705e daq-2.0.7.tar.gz # Hash for license files: sha256 07f28289c09fd9eb5a6ff7bc710ff40363601b1bbc6f3637d8ed412150e90819 COPYING
package/daq/daq.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -DAQ_VERSION = 2.0.6 +DAQ_VERSION = 2.0.7 DAQ_SITE = https://www.snort.org/downloads/snort DAQ_LICENSE = GPL-2.0 DAQ_LICENSE_FILES = COPYING
Signature · 1 line
2.25.0
PATCH 2/3 package/daq: bump version to 2.0.7
Bernd, All,
On 2020-04-14 21:48 +0200, Bernd Kuhls spake thusly:
Quoted 8 lines
Added md5 hash provided by upstream.
Signed-off-by Bernd Kuhls <[email protected]>---
Please note that building this version without autoreconf is broken on my system in contrast to version 2.0.6, reason unknown after comparing the source code of both versions. The configure script is re-run during build
The reason is that configure.ac is more recent than the rest of the autotools files (and in fact more recent than all the other files). Even Makefile.am is more recent than Makefile.in:
$ ls -1Art
README
missing
Makefile.in
Makefile.am
m4
ltmain.sh
install-sh
depcomp
daq.dsp
COPYING
configure
config.sub
config.h.in
config.guess
compile
ChangeLog
api
aclocal.m4
sfbpf
os-daq-modules
daq.vcxproj
configure.ac $ stat configure.ac configure
File: configure.ac
Size: 11296 Blocks: 24 IO Block: 4096 regular file
Device: 10301h/66305d Inode: 7884583 Links: 1
Access: (0444/-r--r--r--) Uid: ( 1000/ ymorin) Gid: ( 1000/ ymorin)
Access: 2020-04-14 22:22:36.035348803 +0200
Modify: 2020-04-08 14:23:58.000000000 +0200
Change: 2020-04-14 22:22:36.035348803 +0200
Birth: -
File: configure
Size: 497485 Blocks: 976 IO Block: 4096 regular file
Device: 10301h/66305d Inode: 7879943 Links: 1
Access: (0555/-r-xr-xr-x) Uid: ( 1000/ ymorin) Gid: ( 1000/ ymorin)
Access: 2020-04-14 22:22:36.027348801 +0200
Modify: 2020-04-08 14:23:57.000000000 +0200
Change: 2020-04-14 22:22:36.031348803 +0200
Birth: -So we can see that configure is oh-so=slightly older than configure.ac. So 'make' will try to resolve the problem by generating it again, which, as you discovered, does not work so nicely. We could solve the issue without running autoreconf with somthing like:
define DAQ_TOUCH_AUTOSTUFF
touch $(@D)/configure
touch $(@D)/Makefile.in
endefThat, provided that configure is indeed in sync with configure.ac, of course. Note also that there might be an issue with Makefile.{am,in} in sub-directories, as the .in are at exactly the same date as the .am.
Can you check if the above inded fixes the issue? If so, can you respin a series, please? Note, this is still acceptable to have the paralle fixup even if autoreconf is not mandatory.
Additionaly, I wonder why we don't switch to snort 3.0 and daq 2.2.2, instead. Any idea?
Regards,
Yann E. MORIN.
Quoted 42 lines
causing an error because of variables missing at this stage in
DAQ_CONF_ENVto fix libpcap detection. Running autoreconf fixes this problem so I took the freedom to add the parallel build fix used by Gentoo in this series to save some build time again.package/daq/daq.hash | 4 +++- package/daq/daq.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)package/daq/daq.hash +3
-1@@ -1,5 +1,7 @@ +# From https://www.snort.org/downloads/snort/md5s +md5 ea796f001d1b00302e4e69e337ab2460 daq-2.0.7.tar.gz # Locally computed: -sha256 d41da5f7793e66044e6927dd868c0525e7ee4ec1a3515bf74ef9a30cd9273af0 daq-2.0.6.tar.gz +sha256 bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13a7705e daq-2.0.7.tar.gz # Hash for license files: sha256 07f28289c09fd9eb5a6ff7bc710ff40363601b1bbc6f3637d8ed412150e90819 COPYINGpackage/daq/daq.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -DAQ_VERSION = 2.0.6 +DAQ_VERSION = 2.0.7 DAQ_SITE = https://www.snort.org/downloads/snort DAQ_LICENSE = GPL-2.0 DAQ_LICENSE_FILES = COPYINGSignature · 6 lines
2.25.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 3/3 package/snort: bump version to 2.9.16
In reply to Bernd KuhlsAdded md5 hash provided by upstream.
--- package/snort/snort.hash | 4 +++- package/snort/snort.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
package/snort/snort.hash +3 -1
@@ -1,5 +1,7 @@ +# From https://www.snort.org/downloads/snort/md5s +md5 1cec58babaea3420014d61a93e6e1545 snort-2.9.16.tar.gz # Locally computed: -sha256 2cccfc1d1a706586cd47ae9f085a7d5e4e36390b8e9c28cd2020b4b5b587f6c3 snort-2.9.15.1.tar.gz +sha256 9688d8edf1da09dec6574000fb3c0e62f99c56428587616e17c60103c0bcbad7 snort-2.9.16.tar.gz # Hash for license files: sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE
package/snort/snort.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -SNORT_VERSION = 2.9.15.1 +SNORT_VERSION = 2.9.16 SNORT_SITE = https://www.snort.org/downloads/snort SNORT_LICENSE = GPL-2.0 SNORT_LICENSE_FILES = LICENSE COPYING
Signature · 1 line
2.25.0