From: Jason Ish <jason.ish@oisf.net>
Date: Thu, 10 Apr 2025 15:12:35 +0000 (-0600)
Subject: rust: always update Cargo.lock.in
X-Git-Tag: suricata-8.0.0-rc1~478
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e65cccc09ed2599ae2950f2755923ba169f2ab5;p=thirdparty%2Fsuricata.git

rust: always update Cargo.lock.in

On a normal project where the Cargo.lock is checked in, it would be
normal to see an updated Cargo.lock in git status and the like. As we
use autoconf to generate this file, we should just copy it back to the
input file so we get the same convenience of seeing when it is
updated, which usually means it needs to be checked in.

However, to satisfy "make distcheck", only copy it if the input
template exists, if the input template does not exist we are in an out
of tree build.
---

diff --git a/rust/Makefile.am b/rust/Makefile.am
index fc90140bd7..9a9828c346 100644
--- a/rust/Makefile.am
+++ b/rust/Makefile.am
@@ -74,6 +74,9 @@ all-local: Cargo.toml
 	fi
 	$(MAKE) gen/rust-bindings.h
 	$(MAKE) gen/htp/htp_rs.h
+	if test -e Cargo.lock.in; then \
+		cp Cargo.lock Cargo.lock.in; \
+	fi
 
 install-exec-local:
 	install -d -m 0755 "$(DESTDIR)$(bindir)"