You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
1.6 KiB
56 lines
1.6 KiB
2 years ago
|
From fe1e9d3f6d87416aa4cd8f8bee186d71a8ea2b0f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zuzana Svetlikova <zsvetlik@redhat.com>
|
||
|
|
Date: Fri, 17 Apr 2020 12:59:44 +0200
|
||
|
|
Subject: [PATCH] Disable running gyp on shared deps
|
||
|
|
|
||
|
|
Signed-off-by: rpm-build <rpm-build>
|
||
|
|
---
|
||
|
|
Makefile | 2 +-
|
||
|
|
node.gyp | 17 -----------------
|
||
|
|
2 files changed, 1 insertion(+), 18 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index e0d756f..c90bfa7 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -147,7 +147,7 @@ with-code-cache test-code-cache:
|
||
|
|
$(warning '$@' target is a noop)
|
||
|
|
|
||
|
|
out/Makefile: config.gypi common.gypi node.gyp \
|
||
|
|
- deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \
|
||
|
|
+ deps/llhttp/llhttp.gyp \
|
||
|
|
tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
|
||
|
|
tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
|
||
|
|
$(PYTHON) tools/gyp_node.py -f make
|
||
|
|
diff --git a/node.gyp b/node.gyp
|
||
|
|
index 6b3a6d9..5882cef 100644
|
||
|
|
--- a/node.gyp
|
||
|
|
+++ b/node.gyp
|
||
|
|
@@ -429,23 +429,6 @@
|
||
|
|
],
|
||
|
|
},
|
||
|
|
],
|
||
|
|
- }, {
|
||
|
|
- 'variables': {
|
||
|
|
- 'opensslconfig_internal': '<(obj_dir)/deps/openssl/openssl.cnf',
|
||
|
|
- 'opensslconfig': './deps/openssl/nodejs-openssl.cnf',
|
||
|
|
- },
|
||
|
|
- 'actions': [
|
||
|
|
- {
|
||
|
|
- 'action_name': 'reset_openssl_cnf',
|
||
|
|
- 'inputs': [ '<(opensslconfig)', ],
|
||
|
|
- 'outputs': [ '<(opensslconfig_internal)', ],
|
||
|
|
- 'action': [
|
||
|
|
- 'python', 'tools/copyfile.py',
|
||
|
|
- '<(opensslconfig)',
|
||
|
|
- '<(opensslconfig_internal)',
|
||
|
|
- ],
|
||
|
|
- },
|
||
|
|
- ],
|
||
|
|
}],
|
||
|
|
],
|
||
|
|
}, # node_core_target_name
|
||
|
|
--
|
||
|
|
2.36.1
|
||
|
|
|