[Asterisk-code-review] pjproject bundled: Make build single threaded (asterisk[13])
George Joseph
asteriskteam at digium.com
Sun Dec 18 15:26:01 CST 2016
George Joseph has uploaded a new change for review. ( https://gerrit.asterisk.org/4642 )
Change subject: pjproject_bundled: Make build single threaded
......................................................................
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
---
M third-party/pjproject/Makefile
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/42/4642/1
diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile
index e24a5df..645e7c4 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 @@
.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 @@
libpj%.a: source/build.mak
$(ECHO_PREFIX) Compiling lib $(@F)
$(CMD_PREFIX) $(MAKE) -C $(dir $(shell dirname $@))/build $(@F) $(REALLY_QUIET)
- - at 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)
- - at rm -rf .rebuild_needed
# We need to compile pjlib, then pjlib-util, then the rest
# so we separate them out and create the dependencies
--
To view, visit https://gerrit.asterisk.org/4642
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5648fb91bb89b4224b6bf43a0daa1af793c4ce1
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: George Joseph <gjoseph at digium.com>
More information about the asterisk-code-review
mailing list