From 4f45d62653a2b0e5878607df355c042ea41daa13 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Wed, 26 Oct 2016 17:48:24 -0600 Subject: pjproject_bundled: Remove usage of tar's --strip-components option Older versions of tar don't support the --strip-components option so instead of doing 'tar --strip-components=1 -C source', we now just untar to the tarball's root directory (pjproject-) and rename that directory to 'source'. Also fixed an issue where the pjproject source directory is a hard coded absolute pathname. ASTERISK-26510 #close ASTERISK-22480 #close Change-Id: I9ec92952507a91ff4e4d01e0149e09fd8e8f32b0 --- third-party/pjproject/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'third-party/pjproject/Makefile') diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile index aaf69bff1..07a6c9cd6 100644 --- a/third-party/pjproject/Makefile +++ b/third-party/pjproject/Makefile @@ -1,6 +1,7 @@ .PHONY: _all all _install install clean distclean echo_cflags configure include ../versions.mak +export PJDIR := $(shell pwd -P)/source SPECIAL_TARGETS := @@ -85,9 +86,9 @@ $(DOWNLOAD_DIR)/pjproject-$(PJPROJECT_VERSION).tar.bz2: ../versions.mak source/.unpacked: $(DOWNLOAD_DIR)/pjproject-$(PJPROJECT_VERSION).tar.bz2 $(ECHO_PREFIX) Unpacking $< - -@rm -rf source >/dev/null 2>&1 - -@mkdir source >/dev/null 2>&1 - $(CMD_PREFIX) $(TAR) --strip-components=1 -C source -xjf $< + -@rm -rf source pjproject-* >/dev/null 2>&1 + $(CMD_PREFIX) $(TAR) -xjf $< + @mv pjproject-$(PJPROJECT_VERSION) source $(ECHO_PREFIX) Applying patches $(CMD_PREFIX) ./apply_patches $(QUIET_CONFIGURE) patches source -@touch source/.unpacked -- cgit v1.2.3