2016-01-13 15:09:41 +00:00
|
|
|
From e23b2803b886fb6d001ebcc70aa29713561f316f Mon Sep 17 00:00:00 2001
|
2015-12-02 00:48:58 +00:00
|
|
|
From: Stephen Gallagher <sgallagh@redhat.com>
|
|
|
|
|
Date: Tue, 1 Dec 2015 16:35:29 -0500
|
|
|
|
|
Subject: [PATCH 1/2] disable running gyp files for bundled deps
|
2013-11-12 21:56:28 +00:00
|
|
|
|
|
|
|
|
---
|
|
|
|
|
Makefile | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/Makefile b/Makefile
|
2015-12-02 00:48:58 +00:00
|
|
|
index 02619fac98ddd7bd90648f6493ccf49fcf22c47b..981c3ce4daa8724547979d7646117182399b22db 100644
|
2013-11-12 21:56:28 +00:00
|
|
|
--- a/Makefile
|
|
|
|
|
+++ b/Makefile
|
2015-12-02 00:48:58 +00:00
|
|
|
@@ -47,11 +47,11 @@ $(NODE_EXE): config.gypi out/Makefile
|
2013-05-29 03:12:55 +00:00
|
|
|
|
2015-12-02 00:48:58 +00:00
|
|
|
$(NODE_G_EXE): config.gypi out/Makefile
|
|
|
|
|
$(MAKE) -C out BUILDTYPE=Debug V=$(V)
|
|
|
|
|
ln -fs out/Debug/$(NODE_EXE) $@
|
|
|
|
|
|
|
|
|
|
-out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/build/toolchain.gypi deps/v8/build/features.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi
|
|
|
|
|
+out/Makefile: common.gypi deps/v8/build/toolchain.gypi deps/v8/build/features.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi
|
|
|
|
|
$(PYTHON) tools/gyp_node.py -f make
|
|
|
|
|
|
|
|
|
|
config.gypi: configure
|
|
|
|
|
if [ -f $@ ]; then
|
|
|
|
|
$(error Stale $@, please re-run ./configure)
|
2013-11-12 21:56:28 +00:00
|
|
|
--
|
2016-01-13 15:09:41 +00:00
|
|
|
2.7.0
|
2013-11-12 21:56:28 +00:00
|
|
|
|
