22609d8c1b
Update npm to 6.1.0 https://nodejs.org/en/blog/release/v10.3.0/ Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 03d9247890c2755710a8208974d2919b6a217a63 Mon Sep 17 00:00:00 2001
|
|
From: Zuzana Svetlikova <zsvetlik@redhat.com>
|
|
Date: Thu, 27 Apr 2017 14:25:42 +0200
|
|
Subject: [PATCH 1/4] Disable running gyp on shared deps
|
|
|
|
---
|
|
Makefile | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index a7099947c72a783a4b9d96c950ac084153532d94..bfd205d0992d4bb4b901a1f3d5595e01e6f88bf8 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -89,14 +89,13 @@ $(NODE_EXE): config.gypi out/Makefile
|
|
|
|
$(NODE_G_EXE): config.gypi out/Makefile
|
|
$(MAKE) -C out BUILDTYPE=Debug V=$(V)
|
|
if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi
|
|
|
|
-out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
|
|
- deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \
|
|
- deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
|
|
- config.gypi
|
|
+out/Makefile: common.gypi deps/http_parser/http_parser.gyp \
|
|
+ deps/v8/gypfiles/toolchain.gypi deps/v8/gypfiles/features.gypi \
|
|
+ deps/v8/gypfiles/v8.gyp node.gyp config.gypi
|
|
$(PYTHON) tools/gyp_node.py -f make
|
|
|
|
config.gypi: configure
|
|
$(error Missing or stale $@, please run ./$<)
|
|
|
|
--
|
|
2.17.0
|
|
|