use system-installed node-gyp for building test modules

Last-Update: 2015-09-09
Forwarded: not-needed

Gbp-Pq: Topic deps
Gbp-Pq: Name node_gyp.patch

diff --git a/Makefile b/Makefile
index cef9e8ddf8ec19ae359c24774537bff20dbf9d3c..9fbff812e21035b0586fd94d909d611ac6541277 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -387,13 +387,8 @@ test/addons/.docbuildstamp: $(DOCBUILDSTAMP_PREREQS) tools/doc/node_modules
 # for generating headers. The list is manually synchronized with install.py.
 ADDONS_HEADERS_PREREQS := tools/install.py \
        config.gypi common.gypi \
-       $(wildcard deps/openssl/config/*.h) \
-       $(wildcard deps/openssl/openssl/include/openssl/*.h) \
-       $(wildcard deps/uv/include/*.h) \
-       $(wildcard deps/uv/include/*/*.h) \
        $(wildcard deps/v8/include/*.h) \
        $(wildcard deps/v8/include/*/*.h) \
-       deps/zlib/zconf.h deps/zlib/zlib.h \
        src/node.h src/node_api.h src/js_native_api.h src/js_native_api_types.h \
        src/node_api_types.h src/node_buffer.h src/node_object_wrap.h \
        src/node_version.h
@@ -414,7 +409,7 @@ ADDONS_BINDING_SOURCES := \
        $(filter-out test/addons/??_*/*.h, $(wildcard test/addons/*/*.h))
 
 ADDONS_PREREQS := test/addons/.headersbuildstamp \
-       deps/npm/node_modules/node-gyp/package.json tools/build_addons.py
+       tools/build_addons.py
 
 define run_build_addons
 env $(PYTHON) "$$PWD/tools/build_addons.py" --loglevel=$(LOGLEVEL) --headers-dir "$(ADDONS_HEADERS_DIR)" $1