diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2024-09-02 18:51:39 +0200 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2024-09-09 19:34:06 -0400 |
commit | 90e9ae0f48c38fbcb367133be309c47b97376615 (patch) | |
tree | 3b05c10d048aebbfcaa3a709406ef61e76b41760 | |
parent | baaafdf08b7ffb8703618684d571c4766ea3e28e (diff) | |
download | meta-security-90e9ae0f48c38fbcb367133be309c47b97376615.tar.gz |
suricata: run whole autotools_do_configure not just oe_runconf
Otherwise Makefile isn't regenerated and do_compile fails with:
suricata/7.0.0/suricata-7.0.0/missing: line 81: aclocal-1.16: command not found
after automake upgrade from 1.16.5 to 1.17 from:
https://git.openembedded.org/openembedded-core/commit/?id=b98328a6ff07119e7ba4f1072090d789e69edef8
Fixes:
CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash 'TOPDIR/BUILD/work/mach-distro-linux/suricata/7.0.0/suricata-7.0.0/missing' aclocal-1.16 -I m4
TOPDIR/BUILD/work/mach-distro-linux/suricata/7.0.0/suricata-7.0.0/missing: line 81: aclocal-1.16: command not found
WARNING: 'aclocal-1.16' is missing on your system.
You should only need it if you modified 'acinclude.m4' or
'configure.ac' or m4 files included by 'configure.ac'.
The 'aclocal' program is part of the GNU Automake package:
<https://www.gnu.org/software/automake>
It also requires GNU Autoconf, GNU m4 and Perl in order to run:
<https://www.gnu.org/software/autoconf>
<https://www.gnu.org/software/m4/>
<https://www.perl.org/>
make: *** [Makefile:465: aclocal.m4] Error 127
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-ids/suricata/suricata_7.0.0.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-ids/suricata/suricata_7.0.0.bb b/recipes-ids/suricata/suricata_7.0.0.bb index 9795e95..6e6c426 100644 --- a/recipes-ids/suricata/suricata_7.0.0.bb +++ b/recipes-ids/suricata/suricata_7.0.0.bb | |||
@@ -68,7 +68,7 @@ do_configure:prepend () { | |||
68 | # use host for RUST_SURICATA_LIB_XC_DIR | 68 | # use host for RUST_SURICATA_LIB_XC_DIR |
69 | sed -i -e 's,\${host_alias},${RUST_HOST_SYS},' ${S}/configure.ac | 69 | sed -i -e 's,\${host_alias},${RUST_HOST_SYS},' ${S}/configure.ac |
70 | sed -i -e 's,libsuricata_rust.a,libsuricata.a,' ${S}/configure.ac | 70 | sed -i -e 's,libsuricata_rust.a,libsuricata.a,' ${S}/configure.ac |
71 | oe_runconf | 71 | autotools_do_configure |
72 | } | 72 | } |
73 | 73 | ||
74 | CFLAGS += "-Wno-error=incompatible-pointer-types" | 74 | CFLAGS += "-Wno-error=incompatible-pointer-types" |