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