From: Philippe Antoine <contact@catenacyber.fr>
Date: Fri, 29 Apr 2022 06:55:58 +0000 (+0200)
Subject: rust: cbindgen first verifies existing bindings
X-Git-Tag: suricata-7.0.0-beta1~527
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d761810db48389f9384f93e9a123952a2b18403;p=thirdparty%2Fsuricata.git

rust: cbindgen first verifies existing bindings

So as not to recompile every C file inclusing rust.h
---

diff --git a/rust/Makefile.am b/rust/Makefile.am
index c04ca33bff..daea5f3d64 100644
--- a/rust/Makefile.am
+++ b/rust/Makefile.am
@@ -81,9 +81,8 @@ vendor:
 
 if HAVE_CBINDGEN
 gen/rust-bindings.h: $(RUST_SURICATA_LIB)
-	rm -f gen/rust-bindings.h
 	cbindgen --config $(abs_top_srcdir)/rust/cbindgen.toml \
-		--quiet --output $(abs_top_builddir)/rust/gen/rust-bindings.h
+		--quiet --verify --output $(abs_top_builddir)/rust/gen/rust-bindings.h || true
 else
 gen/rust-bindings.h:
 endif
diff --git a/src/Makefile.am b/src/Makefile.am
index c8d8af8bd9..34b8bae4c2 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1267,7 +1267,7 @@ suricata_SOURCES = main.c
 # the library search path.
 suricata_LDFLAGS = $(all_libraries) ${SECLDFLAGS}
 suricata_LDADD = libsuricata_c.a $(RUST_SURICATA_LIB) $(HTP_LDADD) $(RUST_LDADD)
-suricata_DEPENDENCIES = libsuricata_c.a
+suricata_DEPENDENCIES = libsuricata_c.a $(RUST_SURICATA_LIB)
 
 if BUILD_SHARED_LIBRARY
 libsuricata.so.$(VERSION): libsuricata_c.a