diff options
| author | George Joseph <gjoseph@digium.com> | 2016-10-26 17:48:24 -0600 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2016-10-27 08:28:16 -0600 |
| commit | 61a5c3460ec23a623ac62633d055b34d4dded682 (patch) | |
| tree | 5716535eb10e556845aa1c26a28e738d9dcc600e /third-party | |
| parent | 46863c9d9a3a270ef4b795d132c2b3d9853f0f2d (diff) | |
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-<version>) 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
Diffstat (limited to 'third-party')
| -rw-r--r-- | third-party/pjproject/Makefile | 7 | ||||
| -rw-r--r-- | third-party/pjproject/patches/0000-remove-third-party.patch | 5 |
2 files changed, 9 insertions, 3 deletions
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 diff --git a/third-party/pjproject/patches/0000-remove-third-party.patch b/third-party/pjproject/patches/0000-remove-third-party.patch index 131775195..aca7f0198 100644 --- a/third-party/pjproject/patches/0000-remove-third-party.patch +++ b/third-party/pjproject/patches/0000-remove-third-party.patch @@ -2,6 +2,11 @@ diff --git a/build.mak.in b/build.mak.in index 802211c..006d887 100644 --- a/build.mak.in +++ b/build.mak.in +@@ -1,4 +1,3 @@ +-export PJDIR := @ac_pjdir@ + include $(PJDIR)/version.mak + export PJ_DIR := $(PJDIR) + @@ -9,7 +9,7 @@ export HOST_NAME := unix export CC_NAME := gcc export TARGET_NAME := @target@ |