[vlc-commits] contrib: rust: freeze the Rust version

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Oct 13 11:14:22 2020 +0200| [ae5970d0fed4dbe42cc5f6dd3c9a1fa96e6c9875] | committer: Thomas Guillem

contrib: rust: freeze the Rust version

For reproducible builds, to avoid contrib breakage from external events
(A new Rust update).

It's now our responsibility to increment the Rust version in case of new
updates.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ae5970d0fed4dbe42cc5f6dd3c9a1fa96e6c9875
---

 contrib/src/cargo/rules.mak | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/src/cargo/rules.mak b/contrib/src/cargo/rules.mak
index 3de18a46a6..4169e7d844 100644
--- a/contrib/src/cargo/rules.mak
+++ b/contrib/src/cargo/rules.mak
@@ -1,5 +1,6 @@
 # cargo/cargo-c installation via rustup
 
+RUST_VERSION=1.47.0
 RUSTUP_VERSION=1.22.1
 RUSTUP_URL=https://github.com/rust-lang/rustup/archive/$(RUSTUP_VERSION).tar.gz
 
@@ -30,8 +31,8 @@ endif
 .cargo: rustup
 	cd $< && RUSTUP_INIT_SKIP_PATH_CHECK=yes \
 	  RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) \
-	  ./rustup-init.sh --no-modify-path -y
-	$(RUSTUP) default stable
+	  ./rustup-init.sh --no-modify-path -y --default-toolchain $(RUST_VERSION)
+	$(RUSTUP) default $(RUST_VERSION)
 	$(RUSTUP) target add $(RUST_TARGET)
 	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH CFLAGS CPPFLAGS LDFLAGS; \
 		$(CARGO) install $(CARGOC_FEATURES) cargo-c