From 7aacc0fc7fb99c3eb68a1d1a79e39b1e4cfebcc7 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Sun, 18 Dec 2016 14:23:17 -0700 Subject: [PATCH] pjproject_bundled: Make build single threaded There were just too many issues in various environments with multi threaded building of pjproject. It doesn't really speed things up anyway since asterisk is already being compiled in parallel. Change-Id: Ie5648fb91bb89b4224b6bf43a0daa1af793c4ce1 (cherry picked from commit 815f7551550908c83220196ba08742af0c745772) --- third-party/pjproject/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile index 257c3ec847..b799d4fe44 100644 --- a/third-party/pjproject/Makefile +++ b/third-party/pjproject/Makefile @@ -1,5 +1,7 @@ .PHONY: _all all _install install clean distclean echo_cflags configure +.NOTPARALLEL: + include ../versions.mak export PJDIR := $(shell pwd -P)/source @@ -114,7 +116,6 @@ source/pjlib/include/pj/%.h: patches/%.h .rebuild_needed: $(wildcard ../../makeopts) $(wildcard ../../menuselect.makeopts) $(ECHO_PREFIX) Rebuilding $(CMD_PREFIX) $(MAKE) clean $(REALLY_QUIET) - @touch .rebuild_needed source/build.mak: Makefile.rules source/version.mak source/user.mak $(addprefix source/pjlib/include/pj/,$(notdir $(wildcard patches/*.h))) .rebuild_needed $(ECHO_PREFIX) Configuring with $(PJPROJECT_CONFIG_OPTS) @@ -131,13 +132,11 @@ echo_cflags: source/build.mak libpj%.a: source/build.mak $(ECHO_PREFIX) Compiling lib $(@F) $(CMD_PREFIX) $(MAKE) -C $(dir $(shell dirname $@))/build $(@F) $(REALLY_QUIET) - -@rm -rf .rebuild_needed # pjsua needs resample and g711 to successfully run the testsuite -libresample%.a: .rebuild_needed source/build.mak +libresample%.a: source/build.mak $(ECHO_PREFIX) Compiling lib $(@F) $(CMD_PREFIX) $(MAKE) -C $(dir $(shell dirname $@))/build/resample all $(REALLY_QUIET) - -@rm -rf .rebuild_needed # We need to compile pjlib, then pjlib-util, then the rest # so we separate them out and create the dependencies -- 2.47.2