vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Tue Mar 5 10:55:40 2019 +0100| [a2802c79307ae9b4a2985d01d07cfc5500d0f79b] | committer: Steve Lhomme
contrib: call pkg-static via the SRC variable (cherry picked from commit b63ac06b0eaac200462fd4c6d94c760a56a71895) (rebased) rebased: - AOM/VPX have the pthreadGC2 patches not found in master anymore Signed-off-by: Steve Lhomme <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a2802c79307ae9b4a2985d01d07cfc5500d0f79b --- contrib/src/aom/rules.mak | 2 +- contrib/src/libdsm/rules.mak | 2 +- contrib/src/main.mak | 2 +- contrib/src/speex/rules.mak | 2 +- contrib/src/speexdsp/rules.mak | 2 +- contrib/src/vpx/rules.mak | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak index c0c9d0e8ac..ed6e4b8333 100644 --- a/contrib/src/aom/rules.mak +++ b/contrib/src/aom/rules.mak @@ -95,6 +95,6 @@ endif cd $< && mkdir -p aom_build cd $</aom_build && LDFLAGS="$(AOM_LDFLAGS)" $(HOSTVARS) CFLAGS="$(AOM_CFLAGS)" CXXFLAGS="$(AOM_CXXFLAGS)" $(CMAKE) ../ $(AOM_CONF) cd $< && $(MAKE) -C aom_build - cd $</aom_build && ../../../../contrib/src/pkg-static.sh aom.pc + cd $</aom_build && $(SRC)/pkg-static.sh aom.pc cd $</aom_build && $(MAKE) install touch $@ diff --git a/contrib/src/libdsm/rules.mak b/contrib/src/libdsm/rules.mak index ed1b86cd4b..4406d7ff3d 100644 --- a/contrib/src/libdsm/rules.mak +++ b/contrib/src/libdsm/rules.mak @@ -32,6 +32,6 @@ endif $(RECONF) cd $< && $(HOSTVARS_PIC) ./configure --disable-programs $(LIBDSM_CONF) cd $< && $(MAKE) - cd $< && ../../../contrib/src/pkg-static.sh libdsm.pc + cd $< && $(SRC)/pkg-static.sh libdsm.pc cd $< && $(MAKE) install touch $@ diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 23486e953b..ddcc496a0c 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -355,7 +355,7 @@ UNPACK = $(RM) -R $@ \ $(foreach f,$(filter %.zip,$^), && unzip $(f)) UNPACK_DIR = $(patsubst %.tar,%,$(basename $(notdir $<))) APPLY = (cd $(UNPACK_DIR) && patch -fp1) < -pkg_static = (cd $(UNPACK_DIR) && ../../../contrib/src/pkg-static.sh $(1)) +pkg_static = (cd $(UNPACK_DIR) && $(SRC)/pkg-static.sh $(1)) MOVE = mv $(UNPACK_DIR) $@ && touch $@ AUTOMAKE_DATA_DIRS=$(foreach n,$(foreach n,$(subst :, ,$(shell echo $$PATH)),$(abspath $(n)/../share)),$(wildcard $(n)/automake*)) diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak index 455c1b5f99..ebe1ed251d 100644 --- a/contrib/src/speex/rules.mak +++ b/contrib/src/speex/rules.mak @@ -31,6 +31,6 @@ endif .speex: speex cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEX_CONF) cd $< && $(MAKE) - cd $< && ../../../contrib/src/pkg-static.sh speex.pc + cd $< && $(SRC)/pkg-static.sh speex.pc cd $< && $(MAKE) install touch $@ diff --git a/contrib/src/speexdsp/rules.mak b/contrib/src/speexdsp/rules.mak index 420bae9bed..eceb8731e4 100644 --- a/contrib/src/speexdsp/rules.mak +++ b/contrib/src/speexdsp/rules.mak @@ -36,6 +36,6 @@ endif $(RECONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEXDSP_CONF) cd $< && $(MAKE) - cd $< && ../../../contrib/src/pkg-static.sh speexdsp.pc + cd $< && $(SRC)/pkg-static.sh speexdsp.pc cd $< && $(MAKE) install touch $@ diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak index ffd2b1a07f..0ea58a5862 100644 --- a/contrib/src/vpx/rules.mak +++ b/contrib/src/vpx/rules.mak @@ -178,6 +178,6 @@ endif cd $< && LDFLAGS="$(VPX_LDFLAGS)" CROSS=$(VPX_CROSS) $(VPX_HOSTVARS) ./configure --target=$(VPX_TARGET) \ $(VPX_CONF) --prefix=$(PREFIX) cd $< && $(MAKE) - cd $< && ../../../contrib/src/pkg-static.sh vpx.pc + cd $< && $(SRC)/pkg-static.sh vpx.pc cd $< && $(MAKE) install touch $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
