From 604a01fa998993e9e42361920620a0e3f6c31484 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 3 Nov 2016 20:40:34 +0100 Subject: [PATCH 1/3] build: add MAKEFLAGS="-j1" to node-gyp Currently, when building the addons the following warning is displayed: make[2]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule. Adding the MAKEFLAGS="-j1" to avoid the warning. Also updated the log message to say that it is building the addon and not running the test as I think that is more accurate. --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5aff7f25c05861..e94b0e79d9547a 100644 --- a/Makefile +++ b/Makefile @@ -166,8 +166,9 @@ test/addons/.buildstamp: config.gypi \ # Cannot use $(wildcard test/addons/*/) here, it's evaluated before # embedded addons have been generated from the documentation. for dirname in test/addons/*/; do \ - echo "\nRunning addons test $$PWD/$$dirname" ; \ - $(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp --loglevel=$(LOGLEVEL) rebuild \ + echo "\nBuilding addon $$PWD/$$dirname" ; \ + MAKEFLAGS="-j1" $(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp \ + --loglevel=$(LOGLEVEL) rebuild \ --python="$(PYTHON)" \ --directory="$$PWD/$$dirname" \ --nodedir="$$PWD" || exit 1 ; \ From 327cd52edace3b51f332c66de0bbfb32c4c85d55 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Fri, 4 Nov 2016 06:09:58 +0100 Subject: [PATCH 2/3] use the shell env command to set MAKEFLAGS --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e94b0e79d9547a..a34fb807f7f4df 100644 --- a/Makefile +++ b/Makefile @@ -167,7 +167,7 @@ test/addons/.buildstamp: config.gypi \ # embedded addons have been generated from the documentation. for dirname in test/addons/*/; do \ echo "\nBuilding addon $$PWD/$$dirname" ; \ - MAKEFLAGS="-j1" $(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp \ + env MAKEFLAGS="-j1" $(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp \ --loglevel=$(LOGLEVEL) rebuild \ --python="$(PYTHON)" \ --directory="$$PWD/$$dirname" \ From fb4eafd9e69a6c84e9615ae6aacc5a1cabbe30d7 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Sat, 5 Nov 2016 21:10:44 +0100 Subject: [PATCH 3/3] supress echoing of for loop --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a34fb807f7f4df..1d2d6f9f9da07b 100644 --- a/Makefile +++ b/Makefile @@ -165,7 +165,7 @@ test/addons/.buildstamp: config.gypi \ test/addons/.docbuildstamp # Cannot use $(wildcard test/addons/*/) here, it's evaluated before # embedded addons have been generated from the documentation. - for dirname in test/addons/*/; do \ + @for dirname in test/addons/*/; do \ echo "\nBuilding addon $$PWD/$$dirname" ; \ env MAKEFLAGS="-j1" $(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp \ --loglevel=$(LOGLEVEL) rebuild \