Merge "pjproject_bundled: Remove usage of tar's --strip-components option" into 14

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

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@