From: George Joseph Date: Sun, 18 Dec 2016 21:23:17 +0000 (-0700) Subject: pjproject_bundled: Make build single threaded X-Git-Tag: 13.14.0-rc1~59^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fchanges%2F42%2F4642%2F1;p=thirdparty%2Fasterisk.git 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 --- diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile index e24a5df675..645e7c4fb5 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 @@ -139,7 +141,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) @@ -156,13 +157,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