diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-08-16 07:06:55 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-08-16 07:06:55 -0500 |
commit | b461fe8bcdb52bb51be7b3fccdac1a08fc3537d1 (patch) | |
tree | 2c170bc5f08f81d4b906bc2bd279ad55591debc0 | |
parent | d08342b0cb1e16ed1c72ce61c8f8c35286dfc6a4 (diff) | |
parent | 8594f73a81318403c1fcb12fb0a1cc5de787fea4 (diff) |
Merge "configure: Check cache for valid pjproject tarball before downloading." into 13
-rw-r--r-- | third-party/pjproject/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile index a5b550842..7a42edcde 100644 --- a/third-party/pjproject/Makefile +++ b/third-party/pjproject/Makefile @@ -86,6 +86,11 @@ SHELL_ECHO_PREFIX := echo '[pjproject] ' _all: $(TARGETS) +define tarball_exists + (if [ -f $(TARBALL) -a -f $(PJMD5SUM) ] ; then exit 0 ;\ + else exit 1; fi; ) +endef + define verify_tarball ($(SHELL_ECHO_PREFIX) Verifying $(TARBALL) &&\ tarball_sum=$$($(CAT) $(TARBALL) | $(MD5) | $(SED) -n -r -e "s/^([^ ]+)\s+.*/\1/gp") ;\ @@ -111,11 +116,12 @@ TARBALL_URL = $(PJPROJECT_URL)/$(TARBALL_FILE) PJMD5SUM = $(patsubst %.tar.bz2,%.md5,$(TARBALL)) $(TARBALL): ../versions.mak - $(CMD_PREFIX) $(download_from_pjproject) || (rm -rf $@ ;\ + $(CMD_PREFIX) ($(tarball_exists) && $(verify_tarball) && touch $@) || (rm -rf $@ ;\ + $(download_from_pjproject)) || (rm -rf $@ ;\ $(SHELL_ECHO_PREFIX) Retrying download ; $(download_from_pjproject)) source/.unpacked: $(DOWNLOAD_DIR)/pjproject-$(PJPROJECT_VERSION).tar.bz2 - ($(verify_tarball)) || (rm -rf $@ ;\ + $(CMD_PREFIX) $(verify_tarball) || (rm -rf $@ ;\ $(SHELL_ECHO_PREFIX) Retrying download ; $(download_from_pjproject)) $(ECHO_PREFIX) Unpacking $< -@rm -rf source pjproject-* >/dev/null 2>&1 |