vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Tue May 21 09:11:10 2019 +0200| [c6aabad24dea295caca2f74a69bee40f4141dc6c] | committer: Steve Lhomme
contrib: fix pkg_static not working with absolute pathes The SRC folder being relative to top contrib directory when the build starts, if we move to other directories we need to compensate for this change. TOPSRC_BUILT is introduced to match the contrib dir from a contrib target folder. It will work for relative pathes and absolute pathes (where it will be the same a TOPSRC). pkg_static_built should be used when patching pkg-config files during the build phase. (cherry picked from commit c17e4583be3080ec108aee4510c01cdb99c89c21) Signed-off-by: Steve Lhomme <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c6aabad24dea295caca2f74a69bee40f4141dc6c --- contrib/bootstrap | 1 + contrib/src/main.mak | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/bootstrap b/contrib/bootstrap index 48c23da04f..8d9e983c1c 100755 --- a/contrib/bootstrap +++ b/contrib/bootstrap @@ -406,6 +406,7 @@ esac # Results output # echo TOPSRC = .. >> Makefile +echo TOPSRC_BUILT = .. >> Makefile echo TOPDST = . >> Makefile echo include $\(TOPSRC\)/src/main.mak >> Makefile echo "Bootstrap completed." diff --git a/contrib/src/main.mak b/contrib/src/main.mak index c9094a9822..9017826e28 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -6,6 +6,7 @@ all: install SRC := $(TOPSRC)/src +SRC_BUILT := $(TOPSRC_BUILT)/src TARBALLS := $(TOPSRC)/tarballs VLC_TOOLS ?= $(TOPSRC)/../extras/tools/build @@ -359,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_BUILT)/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*)) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
