[vlc-devel] [PATCH] contrib: fixed pkg-static and remove direct invocations

[Steve Lhomme]

oops, this was left in my patch folder, please ignore.

On 2019-05-21 10:16, Steve Lhomme wrote:
> From: Konstantin Pavlov <thresh at videolan.org>
> 
> ---
>   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 e128af8090..18d29f9478 100644
> --- a/contrib/src/aom/rules.mak
> +++ b/contrib/src/aom/rules.mak
> @@ -94,6 +94,6 @@ endif
>   	cd $< && mkdir -p aom_build
>   	cd $</aom_build && LDFLAGS="$(AOM_LDFLAGS)" $(HOSTVARS) $(CMAKE) ../ $(AOM_CONF)
>   	cd $< && $(MAKE) -C aom_build
> -	cd $</aom_build && $(SRC)/pkg-static.sh aom.pc
> +	$(call pkg_static,"aom_build/aom.pc")
>   	cd $</aom_build && $(MAKE) install
>   	touch $@
> diff --git a/contrib/src/libdsm/rules.mak b/contrib/src/libdsm/rules.mak
> index 7b6ab9e0da..7fe73b8d60 100644
> --- a/contrib/src/libdsm/rules.mak
> +++ b/contrib/src/libdsm/rules.mak
> @@ -35,6 +35,6 @@ endif
>   	$(RECONF)
>   	cd $< && $(HOSTVARS_PIC) ./configure --disable-programs $(LIBDSM_CONF)
>   	cd $< && $(MAKE)
> -	cd $< && $(SRC)/pkg-static.sh libdsm.pc
> +	$(call pkg_static,"libdsm.pc")
>   	cd $< && $(MAKE) install
>   	touch $@
> diff --git a/contrib/src/main.mak b/contrib/src/main.mak
> index 10954804d8..d1ec7ea4db 100644
> --- a/contrib/src/main.mak
> +++ b/contrib/src/main.mak
> @@ -360,7 +360,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) && $(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 ebe1ed251d..8f4cabef68 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 $< && $(SRC)/pkg-static.sh speex.pc
> +	$(call pkg_static,"speex.pc")
>   	cd $< && $(MAKE) install
>   	touch $@
> diff --git a/contrib/src/speexdsp/rules.mak b/contrib/src/speexdsp/rules.mak
> index eceb8731e4..7733d8a027 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 $< && $(SRC)/pkg-static.sh speexdsp.pc
> +	$(call pkg_static,"speexdsp.pc")
>   	cd $< && $(MAKE) install
>   	touch $@
> diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
> index 0eb08afbe9..7ce09cc2d1 100644
> --- a/contrib/src/vpx/rules.mak
> +++ b/contrib/src/vpx/rules.mak
> @@ -160,6 +160,6 @@ endif
>   	cd $< && LDFLAGS="$(VPX_LDFLAGS)" CROSS=$(VPX_CROSS) ./configure --target=$(VPX_TARGET) \
>   		$(VPX_CONF) --prefix=$(PREFIX)
>   	cd $< && $(MAKE)
> -	cd $< && $(SRC)/pkg-static.sh vpx.pc
> +	$(call pkg_static,"vpx.pc")
>   	cd $< && $(MAKE) install
>   	touch $@
> -- 
> 2.18.1
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>