dnsdist: Explicitly use the versions present in `Cargo.lock` when building

The documentation states that only `cargo update` and `cargo install`
should update the dependencies present in the `Cargo.lock` file, but
it still seems safer to explictly ask `cargo build` to not update them.

Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>

diff --git a/pdns/dnsdistdist/dnsdist-rust-lib/rust/Makefile.am b/pdns/dnsdistdist/dnsdist-rust-lib/rust/Makefile.am
index c30191a2c569e3902e407f946d95e2cc6dccce40..163d29e3d45ecbf6d10aeab723785d296e472345 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-rust-lib/rust/Makefile.am
+++ b/pdns/dnsdistdist/dnsdist-rust-lib/rust/Makefile.am
@@ -10,7 +10,7 @@ if HAVE_YAML_CONFIGURATION
 all install: libdnsdist_rust.a
 
 libdnsdist_rust.a: src/lib.rs src/helpers.rs Cargo.toml Cargo.lock
-       SYSCONFDIR=$(sysconfdir) $(CARGO) build --release $(RUST_TARGET) --target-dir=$(builddir)/target --manifest-path ${srcdir}/Cargo.toml
+       SYSCONFDIR=$(sysconfdir) $(CARGO) build --release $(RUST_TARGET) --target-dir=$(builddir)/target --manifest-path ${srcdir}/Cargo.toml --locked
        cp target/release/libdnsdist_rust.a libdnsdist_rust.a
        cp target/cxxbridge/dnsdist-rust/src/lib.rs.h lib.rs.h
        cp target/cxxbridge/rust/cxx.h cxx.h

diff --git a/pdns/dnsdistdist/dnsdist-rust-lib/rust/build_dnsdist_rust_library b/pdns/dnsdistdist/dnsdist-rust-lib/rust/build_dnsdist_rust_library
index c1b2eda03bfd982ea03fecda61a8e659cc2e8ad0..6b6f4d1ffec1a60d7aec08dc64ec85e77b791c32 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-rust-lib/rust/build_dnsdist_rust_library
+++ b/pdns/dnsdistdist/dnsdist-rust-lib/rust/build_dnsdist_rust_library
@@ -9,7 +9,7 @@
 mytarget=${CARGO_TARGET_DIR-target}
 #echo "mytarget=${mytarget}"
 
-$CARGO build --release $RUST_TARGET --target-dir=$builddir/target --manifest-path $srcdir/Cargo.toml
+$CARGO build --release $RUST_TARGET --target-dir=$builddir/target --manifest-path $srcdir/Cargo.toml --locked
 
 cp -p target/$RUSTC_TARGET_ARCH/release/libdnsdist_rust.a $builddir/dnsdist-rust-lib/rust/libdnsdist_rust.a