Skip to content
Snippets Groups Projects
Commit fb777c84 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

contrib: rav1e: require rustc+cargo before we get the vendor tarball


Since we want to build the vendor tarball if it's not there, we require
rustc+cargo to be available when calling rav1e-vendor-build.
However we cannot do the dependency in the rav1e-vendor-build target
since it would be handled in another process that handles the contrib dependencies.
This can lead to a race condition on building rust+cargo or rustup from
different MAKE processes.

That means we will download the native cargo+rustc during the fetch stage.
Which is actually a good thing, except it won't be in our tarballs.

Co-authored-by: default avatarMartin Storsjö <martin@martin.st>
parent 09a0a121
No related branches found
No related tags found
1 merge request!5731contrib: rav1e: require rustc+cargo to be available before we get the vendor tarball
Pipeline #492257 passed with warnings with stage
in 1 hour, 16 minutes, and 37 seconds
......@@ -33,7 +33,7 @@ DEPS_rav1e += rav1e-vendor $(DEPS_rav1e-vendor) cargo-c $(DEPS_cargo-c)
# rav1e-vendor
rav1e-vendor-build: .rustc
rav1e-vendor-build:
$(RM) -R $@
mkdir -p $@
tar xzfo $(TARBALLS)/rav1e-$(RAV1E_VERSION).tar.gz -C $@ --strip-components=1
......@@ -44,7 +44,7 @@ rav1e-vendor-build: .rustc
# install $@/SHA512SUMS $(SRC)/rav1e-vendor/SHA512SUMS
$(RM) -R $@
$(TARBALLS)/rav1e-$(RAV1E_VERSION)-vendor.tar.bz2: .sum-rav1e
$(TARBALLS)/rav1e-$(RAV1E_VERSION)-vendor.tar.bz2: .sum-rav1e .rustc
-$(call download_vendor,rav1e-$(RAV1E_VERSION)-vendor.tar.bz2,rav1e)
# if the vendor tarball doesn't exist yet, we build it
if test ! -s "$@"; then $(RM) -R rav1e-vendor-build; $(MAKE) rav1e-vendor-build; fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment