From 74ef5461c130a9b009f9f194b2b9865b2a459f3c Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 20 Sep 2018 10:45:55 -0400 Subject: [PATCH] Rebase patches for 10.11.0 Signed-off-by: Stephen Gallagher --- .gitignore | 2 ++ 0001-Disable-running-gyp-on-shared-deps.patch | 8 ++++---- 0002-Suppress-NPM-message-to-run-global-update.patch | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 87010d5..b5672bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +/*.tar.gz +/*.src.rpm /node-v0.9.3.tar.gz /node-v0.9.4.tar.gz /node-v0.9.5.tar.gz diff --git a/0001-Disable-running-gyp-on-shared-deps.patch b/0001-Disable-running-gyp-on-shared-deps.patch index c457298..79cbc7e 100644 --- a/0001-Disable-running-gyp-on-shared-deps.patch +++ b/0001-Disable-running-gyp-on-shared-deps.patch @@ -1,4 +1,4 @@ -From dc60fa79586e5e8681f019e80080aebc227d0c03 Mon Sep 17 00:00:00 2001 +From def28d29f907050d8bcd94ed2e341d128ffa3fa6 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Thu, 27 Apr 2017 14:25:42 +0200 Subject: [PATCH 1/2] Disable running gyp on shared deps @@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Disable running gyp on shared deps 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index 7f9a57804b77606a3bec03f6be707969d71d3562..dd68e1ba2d3928f46c5d1f8991ded98bc1465323 100644 +index 5fc2bb0c58f5532044a14e9f9595b2316f562726..f1c1545caa220d7442d6d92c49412ec7554de123 100644 --- a/Makefile +++ b/Makefile @@ -121,14 +121,13 @@ with-code-cache: @@ -26,9 +26,9 @@ index 7f9a57804b77606a3bec03f6be707969d71d3562..dd68e1ba2d3928f46c5d1f8991ded98b + deps/v8/gypfiles/v8.gyp node.gyp config.gypi $(PYTHON) tools/gyp_node.py -f make - config.gypi: configure + config.gypi: configure configure.py @if [ -x config.status ]; then \ ./config.status; \ -- -2.19.0.rc1 +2.19.0 diff --git a/0002-Suppress-NPM-message-to-run-global-update.patch b/0002-Suppress-NPM-message-to-run-global-update.patch index 752a49c..fd54ee2 100644 --- a/0002-Suppress-NPM-message-to-run-global-update.patch +++ b/0002-Suppress-NPM-message-to-run-global-update.patch @@ -1,4 +1,4 @@ -From 6fa6df3e7ec585d1bf1386dcf29f608a039bbbe9 Mon Sep 17 00:00:00 2001 +From ab6c18fd9aba942bee3f2f8030273c846b6025a6 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 1 May 2018 08:05:30 -0400 Subject: [PATCH 2/2] Suppress NPM message to run global update @@ -83,5 +83,5 @@ index 6f76b23828531e7af98a7e3cd7d5abfaac09b40c..98edb6f45fe073e03794a2ae6e7aa7f5 !err && npm.config.get('ham-it-up') && -- -2.19.0.rc1 +2.19.0