From efe742cebca003105739176d0bb35e121b901771 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Tue, 22 Aug 2017 13:15:38 +0200 Subject: [PATCH] Fix gyp patch to include http-parser --- ...le-running-gyp-files-for-bundled-deps.patch | 18 +++++++----------- nodejs.spec | 5 ++++- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/0001-Disable-running-gyp-files-for-bundled-deps.patch b/0001-Disable-running-gyp-files-for-bundled-deps.patch index 8777f8e..2a506f5 100644 --- a/0001-Disable-running-gyp-files-for-bundled-deps.patch +++ b/0001-Disable-running-gyp-files-for-bundled-deps.patch @@ -1,29 +1,25 @@ -From be1738c229765ad0796b97e842515b5d8834c894 Mon Sep 17 00:00:00 2001 +From 55269de7552aebc324cb0333d38d600897555b9c Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova -Date: Wed, 22 Mar 2017 19:13:10 +0100 -Subject: [PATCH 1/3] Disable running gyp files for bundled deps +Date: Tue, 22 Aug 2017 13:11:56 +0200 +Subject: [PATCH] Disable gyp --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index cfbd426033c7f2882f77cd60faaf3bb0277e6c57..8ca97d5552ebb328d8d6727531b13843864a6e86 100644 +index cfbd426033..ee05b63f8f 100644 --- a/Makefile +++ b/Makefile -@@ -75,11 +75,11 @@ $(NODE_EXE): config.gypi out/Makefile - - $(NODE_G_EXE): config.gypi out/Makefile +@@ -77,7 +77,7 @@ $(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/build/toolchain.gypi deps/v8/build/features.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi -+out/Makefile: common.gypi deps/v8/build/toolchain.gypi deps/v8/build/features.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi ++out/Makefile: common.gypi deps/http_parser/http_parser.gyp deps/v8/build/toolchain.gypi deps/v8/build/features.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi $(PYTHON) tools/gyp_node.py -f make config.gypi: configure - $(error Missing or stale $@, please run ./$<) - -- -2.13.5 +2.14.1 diff --git a/nodejs.spec b/nodejs.spec index 52cd741..14ae4bb 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -19,7 +19,7 @@ %global nodejs_patch 2 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} -%global nodejs_release 1.2 +%global nodejs_release 1.3 # == Bundled Dependency Versions == # v8 - from deps/v8/include/v8-version.h @@ -407,6 +407,9 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Tue Aug 22 2017 Zuzana Svetlikova - 1:6.11.2-1.3 +- Run gyp on http-parser + * Tue Aug 15 2017 Stephen Gallagher - 1:6.11.2-1.2 - Add bundled Provides for http-parser