From e610e7c72e8d8e5bdc270b01922488b1bdce8f6b Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Tue, 1 Apr 2025 12:56:37 -0400 Subject: [PATCH] suricata: fix build error introduced by upstream commit 7a2b9acef2 cargo: pass PACKAGECONFIG_CONFARGS to cargo build error: unexpected argument '--with-libcap_ng-includes' found | | Usage: cargo build --verbose... --target [] --release --manifest-path --offline Signed-off-by: Armin Kuster --- recipes-ids/suricata/suricata_7.0.0.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/recipes-ids/suricata/suricata_7.0.0.bb b/recipes-ids/suricata/suricata_7.0.0.bb index 6e6c426..910e21e 100644 --- a/recipes-ids/suricata/suricata_7.0.0.bb +++ b/recipes-ids/suricata/suricata_7.0.0.bb @@ -73,6 +73,18 @@ do_configure:prepend () { CFLAGS += "-Wno-error=incompatible-pointer-types" +# Commit 7a2b9acef2 cargo: pass PACKAGECONFIG_CONFARGS to cargo build +# breaks building this recipe. Providing a copy of the original function +# Armin 2025/04/01 +# +oe_cargo_build () { + export RUSTFLAGS="${RUSTFLAGS}" + bbnote "Using rust targets from ${RUST_TARGET_PATH}" + bbnote "cargo = $(which ${CARGO})" + bbnote "${CARGO} build ${CARGO_BUILD_FLAGS}$@" + "${CARGO}" build ${CARGO_BUILD_FLAGS}"$@" +} + do_compile () { # we do this to bypass the make provided by this pkg # patches Makefile to skip the subdir