Skip to content
Snippets Groups Projects
Commit a12187ee authored by Steve Lhomme's avatar Steve Lhomme Committed by Hugo Beauzée-Luyssen
Browse files

contrib: always depend on the dependencies of a dependency

So the order of build is always respected, even in case of build error.
parent 58bd8131
No related branches found
No related tags found
1 merge request!2524contrib: always depend on the dependencies of a dependency
Pipeline #261507 failed with stages
in 25 minutes and 47 seconds
......@@ -23,7 +23,7 @@ aribb24: aribb24-$(ARIBB24_VERSION).tar.gz .sum-aribb24
$(call pkg_static,"src/aribb24.pc.in")
$(MOVE)
DEPS_aribb24 = png
DEPS_aribb24 = png $(DEPS_png)
.aribb24: aribb24
$(REQUIRE_GPL)
......
......@@ -36,7 +36,7 @@ FFMPEGCONF += \
--disable-securetransport
endif
DEPS_ffmpeg = zlib gsm
DEPS_ffmpeg = zlib $(DEPS_zlib) gsm $(DEPS_gsm)
FFMPEGCONF += \
--enable-libopenjpeg
......
......@@ -33,7 +33,7 @@ endif
$(APPLY) $(SRC)/gcrypt/0001-cipher-Makefile.am-force-tag-CC-for-.S-files.patch
$(MOVE)
DEPS_gcrypt = gpg-error
DEPS_gcrypt = gpg-error $(DEPS_gpg-error)
GCRYPT_CONF = \
--enable-ciphers=aes,des,rfc2268,arcfour \
......
......@@ -7,7 +7,7 @@ ifeq ($(call need_pkg,"libarchive >= 3.2.0"),)
PKGS_FOUND += libarchive
endif
DEPS_libarchive = zlib
DEPS_libarchive = zlib $(DEPS_zlib)
LIBARCHIVE_CONF := $(HOSTCONF) \
--disable-bsdcpio --disable-bsdtar --disable-bsdcat \
......
......@@ -21,7 +21,7 @@ libdsm: libdsm-$(LIBDSM_VERSION).tar.xz .sum-libdsm
$(UNPACK)
$(MOVE)
DEPS_libdsm = libtasn1 iconv
DEPS_libdsm = libtasn1 $(DEPS_libtasn1) iconv $(DEPS_iconv)
ifdef HAVE_WIN32
DEPS_libdsm += pthreads $(DEPS_pthreads)
endif
......
......@@ -9,7 +9,7 @@ PLACEBOCONF := -Dglslang=enabled \
-Ddemos=false \
-Dtests=false
DEPS_libplacebo = glslang
DEPS_libplacebo = glslang $(DEPS_glslang)
ifndef HAVE_WINSTORE
PKGS += libplacebo
......
......@@ -3,7 +3,7 @@
SPATIALAUDIO_VERSION := 0.3.0
SPATIALAUDIO_URL = https://github.com/videolabs/libspatialaudio/releases/download/$(SPATIALAUDIO_VERSION)/spatialaudio-$(SPATIALAUDIO_VERSION).tar.bz2
DEPS_spatialaudio = zlib mysofa
DEPS_spatialaudio = zlib $(DEPS_zlib) mysofa $(DEPS_mysofa)
PKGS += spatialaudio
......
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