diff --git a/0001-Disable-running-gyp-on-shared-deps.patch b/0001-Disable-running-gyp-on-shared-deps.patch deleted file mode 100644 index 611a745..0000000 --- a/0001-Disable-running-gyp-on-shared-deps.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 0164079f84aae90d0f61d84b90dd6e05bca8890c Mon Sep 17 00:00:00 2001 -From: Zuzana Svetlikova -Date: Fri, 17 Apr 2020 12:59:44 +0200 -Subject: [PATCH] Disable running gyp on shared deps - -Signed-off-by: rpm-build ---- - Makefile | 4 ++-- - node.gyp | 17 ----------------- - 2 files changed, 2 insertions(+), 19 deletions(-) - -diff --git a/Makefile b/Makefile -index 94013466239e9c43ddce5cebc7a8d0a4dc56db4f..8577570c95d20dcf8d3dfe5d9fe82c1f67b2d70a 100644 ---- a/Makefile -+++ b/Makefile -@@ -169,7 +169,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 \ - deps/simdutf/simdutf.gyp \ - tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ - tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp -@@ -1550,7 +1550,7 @@ CONFLICT_RE=^>>>>>>> [[:xdigit:]]+|^<<<<<<< [[:alpha:]]+ - - # Related CI job: node-test-linter - lint-ci: lint-js-ci lint-cpp lint-py lint-md lint-addon-docs lint-yaml-build lint-yaml -- @if ! ( grep -IEqrs "$(CONFLICT_RE)" --exclude="error-message.js" --exclude="merge-conflict.json" benchmark deps doc lib src test tools ) \ -+ @if ! ( grep -IEqrs "$(CONFLICT_RE)" --exclude="error-message.js" benchmark deps doc lib src test tools ) \ - && ! ( $(FIND) . -maxdepth 1 -type f | xargs grep -IEqs "$(CONFLICT_RE)" ); then \ - exit 0 ; \ - else \ -diff --git a/node.gyp b/node.gyp -index cec24aed034362530cfbe833f4f52098f3fbaf2e..13af00f40d006fa75bfc5f656b505d29abf5038e 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.39.1 - diff --git a/packaging/nodejs.spec.in b/packaging/nodejs.spec.in index c9a4a71..d84c0e4 100644 --- a/packaging/nodejs.spec.in +++ b/packaging/nodejs.spec.in @@ -161,9 +161,6 @@ Source102: wasi-sdk-@LEXER_WASI_MAJOR@.@LEXER_WASI_MINOR@-linux.tar.gz Source111: undici-@UNDICI_VERSION@-stripped.tar.gz Source112: wasi-sdk-@UNDICI_WASI_MAJOR@.@UNDICI_WASI_MINOR@-linux.tar.gz -# Disable running gyp on bundled deps we don't use -Patch1: 0001-Disable-running-gyp-on-shared-deps.patch - %if 0%{?nodejs_default} %global pkgname nodejs %package -n %{pkgname}