From 7067226e67054819464345a265fadb0b82e45b02 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Thu, 6 Oct 2022 11:57:59 +0200 Subject: [PATCH 1/5] contrib: cargo: add the internal rustup target to PKGS_ALL --- contrib/src/cargo/rules.mak | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/src/cargo/rules.mak b/contrib/src/cargo/rules.mak index 71dd905af6..480108c453 100644 --- a/contrib/src/cargo/rules.mak +++ b/contrib/src/cargo/rules.mak @@ -5,6 +5,8 @@ CARGOC_VERSION=0.9.13 RUSTUP_VERSION=1.25.1 RUSTUP_URL=$(GITHUB)/rust-lang/rustup/archive/$(RUSTUP_VERSION).tar.gz +PKGS_ALL += rustup + RUSTUP = . $(CARGO_HOME)/env && \ RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) rustup From c06c4fef41ea9f5bff60c81947ffa302f81fee34 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Thu, 6 Oct 2022 13:21:26 +0200 Subject: [PATCH 2/5] contrib: rav1e-vendor: remove hash for a file we don't use anymore --- contrib/src/rav1e-vendor/SHA512SUMS | 1 - 1 file changed, 1 deletion(-) delete mode 100644 contrib/src/rav1e-vendor/SHA512SUMS diff --git a/contrib/src/rav1e-vendor/SHA512SUMS b/contrib/src/rav1e-vendor/SHA512SUMS deleted file mode 100644 index 4f36e4442a..0000000000 --- a/contrib/src/rav1e-vendor/SHA512SUMS +++ /dev/null @@ -1 +0,0 @@ -33527a381fe402fc7372ad853d0fb3a15c9ea0be45ff288c41621a979f97967d187f3694f2e2cb2f84af774bbf444ae2d2e22ce3237d76e427b746b03602afc8 rav1e-0.3.4-vendor.tar.bz2 From 950967f0037b18daaa990e6546af7b8000eb84b5 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Wed, 7 Dec 2022 08:08:08 +0100 Subject: [PATCH 3/5] contrib: rav1e-vendor: don't check the hash It's a moving target and we currently don't have such tarballs. --- contrib/src/rav1e-vendor/rules.mak | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/src/rav1e-vendor/rules.mak b/contrib/src/rav1e-vendor/rules.mak index 394abb0fa7..939de3769b 100644 --- a/contrib/src/rav1e-vendor/rules.mak +++ b/contrib/src/rav1e-vendor/rules.mak @@ -3,4 +3,7 @@ $(TARBALLS)/rav1e-$(RAV1E_VERSION)-vendor.tar.bz2: $(call download_vendor,rav1e-$(RAV1E_VERSION)-vendor.tar.bz2,rav1e) +.sum-rav1e-vendor: rav1e-$(RAV1E_VERSION)-vendor.tar.bz2 + touch $@ + .rav1e-vendor: rav1e-$(RAV1E_VERSION)-vendor.tar.bz2 From c5a2f25bc1ea58dedeffdf8014ac57b346975efc Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Thu, 6 Oct 2022 11:59:55 +0200 Subject: [PATCH 4/5] contrib: rav1e: use proper dependencies between packages --- contrib/src/rav1e/rules.mak | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/src/rav1e/rules.mak b/contrib/src/rav1e/rules.mak index b0947c34c9..15320798ac 100644 --- a/contrib/src/rav1e/rules.mak +++ b/contrib/src/rav1e/rules.mak @@ -23,7 +23,9 @@ $(TARBALLS)/rav1e-$(RAV1E_VERSION).tar.gz: RAV1E_FEATURES=--features=asm -rav1e: rav1e-$(RAV1E_VERSION).tar.gz .sum-rav1e .rav1e-vendor +DEPS_rav1e = rav1e-vendor $(DEPS_rav1e-vendor) + +rav1e: rav1e-$(RAV1E_VERSION).tar.gz .sum-rav1e $(UNPACK) ifdef HAVE_WIN32 ifndef HAVE_WIN64 From 91178f364f7e3631b259f22126062157b409a6b1 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Fri, 7 Oct 2022 11:35:03 +0200 Subject: [PATCH 5/5] contrib: rav1e: use the vendor directory in the right place Now it's in rav1e-vendor/vendor. --- contrib/src/main-rust.mak | 16 +++++++--------- contrib/src/rav1e/rules.mak | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/contrib/src/main-rust.mak b/contrib/src/main-rust.mak index b642a97d89..68a8ce147d 100644 --- a/contrib/src/main-rust.mak +++ b/contrib/src/main-rust.mak @@ -86,12 +86,10 @@ download_vendor = \ mv $(patsubst %.tar.bz2,%,$(notdir $(f))) $(patsubst .%,%,$@)) touch $@ -CARGO_VENDOR_SETUP = \ - if test -d $@-vendor; then \ - mkdir -p $(UNPACK_DIR)/.cargo; \ - echo "[source.crates-io]" > $(UNPACK_DIR)/.cargo/config.toml; \ - echo "replace-with = \"vendored-sources\"" >> $(UNPACK_DIR)/.cargo/config.toml; \ - echo "[source.vendored-sources]" >> $(UNPACK_DIR)/.cargo/config.toml; \ - echo "directory = \"../$@-vendor\"" >> $(UNPACK_DIR)/.cargo/config.toml; \ - echo "Using cargo vendor archive for $(UNPACK_DIR)"; \ - fi; +cargo_vendor_setup = \ + mkdir -p $1/.cargo; \ + echo "[source.crates-io]" > $1/.cargo/config.toml; \ + echo "replace-with = \"vendored-sources\"" >> $1/.cargo/config.toml; \ + echo "[source.vendored-sources]" >> $1/.cargo/config.toml; \ + echo "directory = \"../$2-vendor/vendor\"" >> $1/.cargo/config.toml; \ + echo "Using cargo vendor archive for $2"; diff --git a/contrib/src/rav1e/rules.mak b/contrib/src/rav1e/rules.mak index 15320798ac..eb55e01c0d 100644 --- a/contrib/src/rav1e/rules.mak +++ b/contrib/src/rav1e/rules.mak @@ -32,7 +32,7 @@ ifndef HAVE_WIN64 $(APPLY) $(SRC)/rav1e/unwind-resume-stub.patch endif endif - $(CARGO_VENDOR_SETUP) + $(call cargo_vendor_setup,$(UNPACK_DIR),$@) $(MOVE) .rav1e: rav1e .cargo