2018-06-07 12:54:08 +00:00
|
|
|
From b5b4b7f8acd2d67c79d1fc2c954aa88edff27511 Mon Sep 17 00:00:00 2001
|
2017-03-22 18:19:11 +00:00
|
|
|
From: Zuzana Svetlikova <zsvetlik@redhat.com>
|
2017-06-28 09:00:13 +00:00
|
|
|
Date: Thu, 27 Apr 2017 14:25:42 +0200
|
2018-06-07 12:54:08 +00:00
|
|
|
Subject: [PATCH 1/2] Disable running gyp on shared deps
|
2017-03-22 18:19:11 +00:00
|
|
|
|
|
|
|
|
---
|
2017-06-28 09:00:13 +00:00
|
|
|
Makefile | 7 +++----
|
|
|
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
2017-03-22 18:19:11 +00:00
|
|
|
|
|
|
|
|
diff --git a/Makefile b/Makefile
|
2018-06-07 12:54:08 +00:00
|
|
|
index b11168aaa456af019a32885f5495c4527a16e9a0..1297fbfc9f68261ea8ebfd1ac70f32581918d078 100644
|
2017-03-22 18:19:11 +00:00
|
|
|
--- a/Makefile
|
|
|
|
|
+++ b/Makefile
|
2018-04-26 14:32:10 +00:00
|
|
|
@@ -89,14 +89,13 @@ $(NODE_EXE): config.gypi out/Makefile
|
|
|
|
|
|
|
|
|
|
$(NODE_G_EXE): config.gypi out/Makefile
|
2017-03-22 18:19:11 +00:00
|
|
|
$(MAKE) -C out BUILDTYPE=Debug V=$(V)
|
|
|
|
|
if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi
|
|
|
|
|
|
2017-06-28 09:00:13 +00:00
|
|
|
-out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
|
|
|
|
|
- deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \
|
2018-04-26 14:32:10 +00:00
|
|
|
- deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
|
2017-06-28 09:00:13 +00:00
|
|
|
- config.gypi
|
|
|
|
|
+out/Makefile: common.gypi deps/http_parser/http_parser.gyp \
|
|
|
|
|
+ deps/v8/gypfiles/toolchain.gypi deps/v8/gypfiles/features.gypi \
|
2018-04-26 14:32:10 +00:00
|
|
|
+ deps/v8/gypfiles/v8.gyp node.gyp config.gypi
|
2017-03-22 18:19:11 +00:00
|
|
|
$(PYTHON) tools/gyp_node.py -f make
|
|
|
|
|
|
|
|
|
|
config.gypi: configure
|
2018-04-26 14:32:10 +00:00
|
|
|
$(error Missing or stale $@, please run ./$<)
|
|
|
|
|
|
2017-03-22 18:19:11 +00:00
|
|
|
--
|
2018-04-26 14:32:10 +00:00
|
|
|
2.17.0
|
|
|
|
|
|
