From 8a455f1c0ab7073fbb8154e591bc10f495c2df8c Mon Sep 17 00:00:00 2001
From: Matthieu Viry <matthieu.viry@cnrs.fr>
Date: Wed, 22 Jan 2025 18:36:13 +0100
Subject: [PATCH] Try to always use vendored crates

---
 configure           | 3 ---
 configure.win       | 5 -----
 src/Makevars.in     | 7 +++----
 src/Makevars.win.in | 8 ++++----
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index 863a3ea..ee9e033 100755
--- a/configure
+++ b/configure
@@ -30,8 +30,6 @@ echo "using Rust compiler: '${RUSTC_VERSION}'"
 
 if [ "$(uname)" = "Emscripten" ]; then
   TARGET="wasm32-unknown-emscripten"
-elif [ "${NOT_CRAN}" != "true" ]; then
-  VENDORING="yes"
 fi
 
 # catch DEBUG envvar, which is passed from pkgbuild::compile_dll()
@@ -44,5 +42,4 @@ fi
 sed \
   -e "s/@TARGET@/${TARGET}/" \
   -e "s/@PROFILE@/${PROFILE}/" \
-  -e "s|@VENDORING@|${VENDORING}|" \
   src/Makevars.in > src/Makevars
diff --git a/configure.win b/configure.win
index 579d77d..6aeab77 100755
--- a/configure.win
+++ b/configure.win
@@ -28,12 +28,7 @@ else
   PROFILE=release
 fi
 
-if [ "${NOT_CRAN}" != "true" ]; then
-  VENDORING="yes"
-fi
-
 sed \
   -e "s/@TARGET@/x86_64-pc-windows-gnu/" \
   -e "s/@PROFILE@/${PROFILE}/" \
-  -e "s|@VENDORING@|${VENDORING}|" \
   src/Makevars.win.in > src/Makevars.win
diff --git a/src/Makevars.in b/src/Makevars.in
index 9058ebd..c1e9bf8 100644
--- a/src/Makevars.in
+++ b/src/Makevars.in
@@ -21,11 +21,10 @@ $(STATLIB):
 	# to set it here to ensure cargo can be invoked. It is appended to PATH and
 	# therefore is only used if cargo is absent from the user's PATH.
 
-	if [ "$(VENDORING)" = "yes" ]; then \
-	  $(TAR) --extract --xz -f ./rust/vendor.tar.xz -C ./rust && \
+	# Use vendored crates
+	$(TAR) --extract --xz -f ./rust/vendor.tar.xz -C ./rust && \
 	    mkdir -p ./rust/.cargo && \
-	    cp ./cargo_vendor_config.toml ./rust/.cargo/config.toml; \
-	fi
+	    cp ./cargo_vendor_config.toml ./rust/.cargo/config.toml
 
 	export PATH="$(PATH):$(HOME)/.cargo/bin" && \
 	  export CC="$(CC)" && \
diff --git a/src/Makevars.win.in b/src/Makevars.win.in
index a01c2fb..d84c5b6 100644
--- a/src/Makevars.win.in
+++ b/src/Makevars.win.in
@@ -26,11 +26,11 @@ $(STATLIB):
 	# in actual, but we need this tweak to please the compiler.
 	mkdir -p $(LIBDIR)/libgcc_mock && touch $(LIBDIR)/libgcc_mock/libgcc_eh.a
 
-	if [ "$(VENDORING)" = "yes" ]; then \
-	  $(TAR) --extract --xz -f ./rust/vendor.tar.xz -C ./rust && \
+
+	# Use vendored crates
+	$(TAR) --extract --xz -f ./rust/vendor.tar.xz -C ./rust && \
 	    mkdir -p ./rust/.cargo && \
-	    cp ./cargo_vendor_config.toml ./rust/.cargo/config.toml; \
-	fi
+	    cp ./cargo_vendor_config.toml ./rust/.cargo/config.toml
 
 	export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \
 	  export LIBRARY_PATH="$${LIBRARY_PATH};$(LIBDIR)/libgcc_mock" && \