[vlc-commits] [Git][videolan/vlc][master] contrib: rav1e: require rustc+cargo before we get the vendor tarball

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
fb777c84 by Steve Lhomme at 2024-07-16T08:46:25+00:00
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: Martin Storsjö <martin at martin.st>

- - - - -


1 changed file:

- contrib/src/rav1e/rules.mak


Changes:

=====================================
contrib/src/rav1e/rules.mak
=====================================
@@ -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



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/fb777c8410d8041400152a794e0124159895f741

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/fb777c8410d8041400152a794e0124159895f741
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance