diff --git a/mingw-w64-nodejs/0001-Fix-python-invocation-to-python2.patch b/mingw-w64-nodejs/0001-Fix-python-invocation-to-python2.patch index a4e6374d99..60cdbf098d 100644 --- a/mingw-w64-nodejs/0001-Fix-python-invocation-to-python2.patch +++ b/mingw-w64-nodejs/0001-Fix-python-invocation-to-python2.patch @@ -1,311 +1,781 @@ -From 2b030720acb6b4f573feec6c4466224eb7e28cc0 Mon Sep 17 00:00:00 2001 -From: Alethea Rose -Date: Tue, 14 Feb 2017 20:56:17 -0500 -Subject: [PATCH 01/23] Fix python invocation to python2 - ---- - common.gypi | 2 +- - deps/cares/build/gcc_version.py | 2 +- - deps/cares/common.gypi | 2 +- - deps/cares/gyp_cares | 2 +- - deps/uv/gyp_uv.py | 2 +- - deps/v8/DEPS | 14 ++++++------ - deps/v8/Makefile | 2 +- - deps/v8/Makefile.android | 2 +- - deps/v8/gypfiles/coverage_wrapper.py | 2 +- - deps/v8/gypfiles/detect_v8_host_arch.py | 2 +- - deps/v8/gypfiles/get_landmines.py | 2 +- - deps/v8/gypfiles/gyp_v8 | 2 +- - deps/v8/gypfiles/isolate.gypi | 2 +- - deps/v8/gypfiles/landmines.py | 2 +- - deps/v8/gypfiles/run-tests-legacy.py | 2 +- - deps/v8/gypfiles/shim_headers.gypi | 2 +- - deps/v8/gypfiles/standalone.gypi | 4 ++-- - deps/v8/gypfiles/toolchain.gypi | 2 +- - deps/v8/gypfiles/vs_toolchain.py | 2 +- - deps/v8/src/d8.gyp | 2 +- - deps/v8/src/v8.gyp | 22 +++++++++---------- - deps/v8/tools/android-run.py | 2 +- - deps/v8/tools/concatenate-files.py | 2 +- - deps/v8/tools/disasm.py | 2 +- - deps/v8/tools/eval_gc_nvp.py | 2 +- - deps/v8/tools/find-commit-for-patch.py | 2 +- - deps/v8/tools/fuzz-harness.sh | 2 +- - deps/v8/tools/gc-nvp-to-csv.py | 2 +- - deps/v8/tools/gc-nvp-trace-processor.py | 2 +- - deps/v8/tools/gcmole/download_gcmole_tools.py | 2 +- - deps/v8/tools/gcmole/gcmole.lua | 2 +- - deps/v8/tools/gcmole/parallel.py | 2 +- - deps/v8/tools/gcmole/run-gcmole.py | 2 +- - deps/v8/tools/gen-postmortem-metadata.py | 2 +- - deps/v8/tools/generate-builtins-tests.py | 2 +- - .../generate_shim_headers.py | 2 +- - deps/v8/tools/grokdump.py | 2 +- - deps/v8/tools/isolate_driver.py | 2 +- - deps/v8/tools/js2c.py | 2 +- - deps/v8/tools/jsfunfuzz/download_jsfunfuzz.py | 2 +- - deps/v8/tools/jsfunfuzz/fuzz-harness.sh | 2 +- - deps/v8/tools/jsmin.py | 2 +- - deps/v8/tools/ll_prof.py | 2 +- - deps/v8/tools/mingw-generate-makefiles.sh | 2 +- - deps/v8/tools/perf-to-html.py | 2 +- - deps/v8/tools/presubmit.py | 2 +- - deps/v8/tools/process-heap-prof.py | 2 +- - deps/v8/tools/release/auto_push.py | 2 +- - deps/v8/tools/release/auto_roll.py | 2 +- - deps/v8/tools/release/auto_tag.py | 2 +- - deps/v8/tools/release/check_clusterfuzz.py | 2 +- - deps/v8/tools/release/common_includes.py | 2 +- - deps/v8/tools/release/create_release.py | 2 +- - deps/v8/tools/release/git_recipes.py | 2 +- - deps/v8/tools/release/merge_to_branch.py | 2 +- - deps/v8/tools/release/mergeinfo.py | 2 +- - deps/v8/tools/release/push_to_candidates.py | 2 +- - deps/v8/tools/release/releases.py | 2 +- - deps/v8/tools/release/script_test.py | 2 +- - .../tools/release/search_related_commits.py | 2 +- - deps/v8/tools/release/test_scripts.py | 2 +- - .../release/test_search_related_commits.py | 2 +- - deps/v8/tools/run-deopt-fuzzer.py | 2 +- - deps/v8/tools/run-valgrind.py | 2 +- - deps/v8/tools/run.py | 2 +- - deps/v8/tools/run_perf.py | 2 +- - deps/v8/tools/sanitizers/sancov_formatter.py | 2 +- - deps/v8/tools/sanitizers/sancov_merger.py | 2 +- - deps/v8/tools/sanitizers/sanitize_pcs.py | 2 +- - deps/v8/tools/stats-viewer.py | 2 +- - deps/v8/tools/test-server.py | 2 +- - deps/v8/tools/testrunner/local/pool.py | 2 +- - .../tools/testrunner/local/pool_unittest.py | 2 +- - deps/v8/tools/testrunner/server/daemon.py | 2 +- - deps/v8/tools/trace-maps-processor.py | 2 +- - deps/v8/tools/try_perf.py | 2 +- - deps/v8/tools/unittests/run_perf_test.py | 2 +- - deps/v8/tools/verify_source_deps.py | 2 +- - 78 files changed, 95 insertions(+), 95 deletions(-) - -diff --git a/common.gypi b/common.gypi -index 99351610..8721d76f 100644 ---- a/common.gypi -+++ b/common.gypi -@@ -9,7 +9,7 @@ - 'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds - 'component%': 'static_library', # NB. these names match with what V8 expects +diff -Naur node-v11.15.0-orig/common.gypi node-v11.15.0/common.gypi +--- node-v11.15.0-orig/common.gypi 2019-04-30 20:31:12.000000000 +0300 ++++ node-v11.15.0/common.gypi 2019-06-27 13:09:51.857895300 +0300 +@@ -11,7 +11,7 @@ 'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way + 'enable_pgo_generate%': '0', + 'enable_pgo_use%': '0', - 'python%': 'python', + 'python%': 'python2', 'node_shared%': 'false', 'force_dynamic_crt%': 0, -diff --git a/deps/cares/build/gcc_version.py b/deps/cares/build/gcc_version.py -index da019e86..b4223af7 100644 ---- a/deps/cares/build/gcc_version.py -+++ b/deps/cares/build/gcc_version.py +diff -Naur node-v11.15.0-orig/configure node-v11.15.0/configure +--- node-v11.15.0-orig/configure 2019-04-30 20:31:12.000000000 +0300 ++++ node-v11.15.0/configure 2019-06-27 13:09:51.882895300 +0300 +@@ -6,7 +6,7 @@ + _=[ 'exec' '/bin/sh' '-c' ''' + which python2.7 >/dev/null && exec python2.7 "$0" "$@" + which python2 >/dev/null && exec python2 "$0" "$@" +-exec python "$0" "$@" ++exec python2 "$0" "$@" + ''' "$0" "$@" + ] + del _ +diff -Naur node-v11.15.0-orig/configure.py node-v11.15.0/configure.py +--- node-v11.15.0-orig/configure.py 2019-04-30 20:31:12.000000000 +0300 ++++ node-v11.15.0/configure.py 2019-06-27 13:09:51.902895400 +0300 +@@ -1570,7 +1570,7 @@ + # sys.executable. This directory will be prefixed to the PATH, so that + # other tools that shell out to `python` will use the appropriate python + +- which_python = which('python') ++ which_python = which('python2') + if (which_python and + os.path.realpath(which_python) == os.path.realpath(sys.executable)): + return +@@ -1581,7 +1581,7 @@ + except OSError as e: + if e.errno != errno.EEXIST: raise e + +- python_link = os.path.join(bin_override, 'python') ++ python_link = os.path.join(bin_override, 'python2') + try: + os.unlink(python_link) + except OSError as e: +@@ -1701,6 +1701,6 @@ + if warn.warned and not options.verbose: + warn('warnings were emitted in the configure phase') + +-print_verbose("running: \n " + " ".join(['python', 'tools/gyp_node.py'] + gyp_args)) ++print_verbose("running: \n " + " ".join(['python2', 'tools/gyp_node.py'] + gyp_args)) + run_gyp(gyp_args) + info('configure completed successfully') +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/gyp node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/gyp +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/gyp 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/gyp 2019-06-27 13:11:28.559030700 +0300 +@@ -5,4 +5,4 @@ + + set -e + base=$(dirname "$0") +-exec python "${base}/gyp_main.py" "$@" ++exec python2 "${base}/gyp_main.py" "$@" +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/gyp_main.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/gyp_main.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/gyp_main.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/gyp_main.py 2019-06-27 13:11:28.614030800 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 - import os - import re -diff --git a/deps/cares/common.gypi b/deps/cares/common.gypi -index 609ad62a..c1871966 100644 ---- a/deps/cares/common.gypi -+++ b/deps/cares/common.gypi -@@ -139,7 +139,7 @@ - - [ 'OS in "linux freebsd openbsd solaris android aix"', { - 'variables': { -- 'gcc_version%': ')' -+ 'gcc_version%': ')' - }, - 'cflags': [ '-Wall' ], - 'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ], -diff --git a/deps/cares/gyp_cares b/deps/cares/gyp_cares -index d1f1640e..ecd3f0ae 100755 ---- a/deps/cares/gyp_cares -+++ b/deps/cares/gyp_cares + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py 2019-06-27 13:11:29.754032400 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 - import glob - import platform -diff --git a/deps/uv/gyp_uv.py b/deps/uv/gyp_uv.py -index bd37d95c..297059b5 100755 ---- a/deps/uv/gyp_uv.py -+++ b/deps/uv/gyp_uv.py + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/common_test.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/common_test.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/common_test.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/common_test.py 2019-06-27 13:11:28.744031000 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/easy_xml_test.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/easy_xml_test.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/easy_xml_test.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/easy_xml_test.py 2019-06-27 13:11:28.804031100 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py 2019-06-27 13:11:28.829031100 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs_test.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs_test.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs_test.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs_test.py 2019-06-27 13:11:29.089031500 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py 2019-06-27 13:11:29.114031500 +0300 +@@ -1754,7 +1754,7 @@ + return '%(python)s gyp-win-tool link-with-manifests $arch %(embed)s ' \ + '%(out)s "%(ldcmd)s" %(resname)s $mt $rc "$intermediatemanifest" ' \ + '$manifests' % { +- 'python': sys.executable, ++ 'python2': sys.executable, + 'out': out, + 'ldcmd': ldcmd, + 'resname': resource_name, +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja_test.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja_test.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja_test.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja_test.py 2019-06-27 13:11:29.134031500 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode.py 2019-06-27 13:11:29.159031600 +0300 +@@ -283,7 +283,7 @@ + command_prefix = '' + if serialize_all_tests: + command_prefix = \ +-"""python -c "import fcntl, subprocess, sys ++"""python2 -c "import fcntl, subprocess, sys + file = open('$TMPDIR/GYP_serialize_test_runs', 'a') + fcntl.flock(file.fileno(), fcntl.LOCK_EX) + sys.exit(subprocess.call(sys.argv[1:]))" """ +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode_test.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode_test.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode_test.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode_test.py 2019-06-27 13:11:29.184031600 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2013 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input_test.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input_test.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input_test.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input_test.py 2019-06-27 13:11:29.264031700 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright 2013 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py 2019-06-27 13:11:29.289031800 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py 2019-06-27 13:11:29.394031900 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py 2019-06-27 13:11:29.619032200 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +@@ -144,7 +144,7 @@ + # first and only link. We still tell link to generate a manifest, but we + # only use that to assert that our simpler process did not miss anything. + variables = { +- 'python': sys.executable, ++ 'python2': sys.executable, + 'arch': arch, + 'out': out, + 'ldcmd': ldcmd, +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/samples/samples node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/samples/samples +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/samples/samples 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/samples/samples 2019-06-27 13:11:29.784032400 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/setup.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/setup.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/setup.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/setup.py 2019-06-27 13:11:29.844032500 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp 2019-06-27 13:11:29.974032700 +0300 +@@ -987,7 +987,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/media/jni/media_player_listener_jni.h', + ], + 'action': [ +- 'python', ++ 'python2', + '<(DEPTH)/base/android/jni_generator/jni_generator.py', + '-o', + '<@(_inputs)', +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp.fontified node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp.fontified +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp.fontified 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp.fontified 2019-06-27 13:11:29.999032700 +0300 +@@ -988,7 +988,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/media/jni/media_player_listener_jni.h', + ], + 'action': [ +- 'python', ++ 'python2', + '<(DEPTH)/base/android/jni_generator/jni_generator.py', + '-o', + '<@(_inputs)', +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py 2019-06-27 13:11:30.024032800 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py 2019-06-27 13:11:30.054032800 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py 2019-06-27 13:11:30.074032900 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py 2019-06-27 13:11:30.104032900 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/lib/configure.js node-v11.15.0/deps/npm/node_modules/node-gyp/lib/configure.js +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/lib/configure.js 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/lib/configure.js 2019-06-27 13:11:30.284033100 +0300 +@@ -47,7 +47,7 @@ + + function getNodeDir () { + +- // 'python' should be set by now ++ // 'python2' should be set by now + process.env.PYTHON = python + + if (gyp.opts.nodedir) { +@@ -397,7 +397,7 @@ + if (err) { + this.log.verbose('`which` failed', this.python, err) + if (this.python === 'python2') { +- this.python = 'python' ++ this.python = 'python2' + return this.checkPython() + } + if (this.win) { +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/README.md node-v11.15.0/deps/npm/node_modules/node-gyp/README.md +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/README.md 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/README.md 2019-06-27 13:11:31.969035500 +0300 +@@ -70,7 +70,7 @@ + ``` + + If `node-gyp` is called by way of `npm` *and* you have multiple versions of +-Python installed, then you can set `npm`'s 'python' config key to the appropriate ++Python installed, then you can set `npm`'s 'python2' config key to the appropriate + value: + + ``` bash +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/test/test-addon.js node-v11.15.0/deps/npm/node_modules/node-gyp/test/test-addon.js +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/test/test-addon.js 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/test/test-addon.js 2019-06-27 13:11:32.224035900 +0300 +@@ -16,13 +16,13 @@ + + function getEncoding() { + var code = 'import locale;print locale.getdefaultlocale()[1]' +- return execFileSync('python', ['-c', code]).toString().trim() ++ return execFileSync('python2', ['-c', code]).toString().trim() + } + + function checkCharmapValid() { + var data + try { +- data = execFileSync('python', ['fixtures/test-charmap.py'], ++ data = execFileSync('python2', ['fixtures/test-charmap.py'], + { cwd: __dirname }) + } catch (err) { + return false +diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/test/test-find-python.js node-v11.15.0/deps/npm/node_modules/node-gyp/test/test-find-python.js +--- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/test/test-find-python.js 2019-04-30 20:31:13.000000000 +0300 ++++ node-v11.15.0/deps/npm/node_modules/node-gyp/test/test-find-python.js 2019-06-27 13:11:32.364036100 +0300 +@@ -9,7 +9,7 @@ + test('find python', function (t) { + t.plan(4) + +- configure.test.findPython('python', function (err, found) { ++ configure.test.findPython('python2', function (err, found) { + t.strictEqual(err, null) + var proc = execFile(found, ['-V'], function (err, stdout, stderr) { + t.strictEqual(err, null) +@@ -55,13 +55,13 @@ + test('find python - python', function (t) { + t.plan(5) + +- var f = new TestPythonFinder('python', done) ++ var f = new TestPythonFinder('python2', done) + f.which = function(program, cb) { +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + cb(null, program) + } + f.execFile = function(program, args, opts, cb) { +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + t.ok(/import sys/.test(args[1])) + cb(null, '2.7.0') + } +@@ -69,20 +69,20 @@ + + function done(err, python) { + t.strictEqual(err, null) +- t.strictEqual(python, 'python') ++ t.strictEqual(python, 'python2') + } + }) + + test('find python - python too old', function (t) { + t.plan(4) + +- var f = new TestPythonFinder('python', done) ++ var f = new TestPythonFinder('python2', done) + f.which = function(program, cb) { +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + cb(null, program) + } + f.execFile = function(program, args, opts, cb) { +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + t.ok(/import sys/.test(args[1])) + cb(null, '2.3.4') + } +@@ -96,13 +96,13 @@ + test('find python - python too new', function (t) { + t.plan(4) + +- var f = new TestPythonFinder('python', done) ++ var f = new TestPythonFinder('python2', done) + f.which = function(program, cb) { +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + cb(null, program) + } + f.execFile = function(program, args, opts, cb) { +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + t.ok(/import sys/.test(args[1])) + cb(null, '3.0.0') + } +@@ -116,9 +116,9 @@ + test('find python - no python', function (t) { + t.plan(2) + +- var f = new TestPythonFinder('python', done) ++ var f = new TestPythonFinder('python2', done) + f.which = function(program, cb) { +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + cb(new Error('not found')) + } + f.checkPython() +@@ -134,14 +134,14 @@ + var f = new TestPythonFinder('python2', done) + f.which = function(program, cb) { + f.which = function(program, cb) { +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + cb(null, program) + } + t.strictEqual(program, 'python2') + cb(new Error('not found')) + } + f.execFile = function(program, args, opts, cb) { +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + t.ok(/import sys/.test(args[1])) + cb(null, '2.7.0') + } +@@ -149,7 +149,7 @@ + + function done(err, python) { + t.strictEqual(err, null) +- t.strictEqual(python, 'python') ++ t.strictEqual(python, 'python2') + } + }) + +@@ -162,7 +162,7 @@ + + f.which = function(program, cb) { + f.which = function(program, cb) { +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + cb(new Error('not found')) + } + t.strictEqual(program, 'python2') +@@ -178,12 +178,12 @@ + test('find python - no python, use python launcher', function (t) { + t.plan(8) + +- var f = new TestPythonFinder('python', done) ++ var f = new TestPythonFinder('python2', done) + f.env = {} + f.win = true + + f.which = function(program, cb) { +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + cb(new Error('not found')) + } + f.execFile = function(program, args, opts, cb) { +@@ -208,12 +208,12 @@ + test('find python - python 3, use python launcher', function (t) { + t.plan(10) + +- var f = new TestPythonFinder('python', done) ++ var f = new TestPythonFinder('python2', done) + f.env = {} + f.win = true + + f.which = function(program, cb) { +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + cb(null, program) + } + f.execFile = function(program, args, opts, cb) { +@@ -228,7 +228,7 @@ + t.notEqual(args.indexOf('-c'), -1) + cb(null, 'Z:\\snake.exe') + } +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + t.ok(/import sys/.test(args[1])) + cb(null, '3.0.0') + } +@@ -244,13 +244,13 @@ + function (t) { + t.plan(9) + +- var f = new TestPythonFinder('python', done) ++ var f = new TestPythonFinder('python2', done) + f.checkedPythonLauncher = false + f.env = {} + f.win = true + + f.which = function(program, cb) { +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + cb(null, program) + } + f.execFile = function(program, args, opts, cb) { +@@ -265,7 +265,7 @@ + t.notEqual(args.indexOf('-c'), -1) + cb(null, 'Z:\\snake.exe') + } +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + t.ok(/import sys/.test(args[1])) + cb(null, '3.0.0') + } +@@ -280,12 +280,12 @@ + t.plan(6) + + var re = /C:[\\\/]Python27[\\\/]python[.]exe/ +- var f = new TestPythonFinder('python', done) ++ var f = new TestPythonFinder('python2', done) + f.env = {} + f.win = true + + f.which = function(program, cb) { +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + cb(new Error('not found')) + } + f.execFile = function(program, args, opts, cb) { +@@ -312,12 +312,12 @@ + test('find python - no python, no python launcher, bad guess', function (t) { + t.plan(4) + +- var f = new TestPythonFinder('python', done) ++ var f = new TestPythonFinder('python2', done) + f.env = { SystemDrive: 'Z:\\' } + f.win = true + + f.which = function(program, cb) { +- t.strictEqual(program, 'python') ++ t.strictEqual(program, 'python2') + cb(new Error('not found')) + } + f.execFile = function(program, args, opts, cb) { +diff -Naur node-v11.15.0-orig/deps/openssl/openssl/fuzz/helper.py node-v11.15.0/deps/openssl/openssl/fuzz/helper.py +--- node-v11.15.0-orig/deps/openssl/openssl/fuzz/helper.py 2019-04-30 20:31:26.000000000 +0300 ++++ node-v11.15.0/deps/openssl/openssl/fuzz/helper.py 2019-06-27 13:13:35.496208600 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + # +diff -Naur node-v11.15.0-orig/deps/uv/gyp_uv.py node-v11.15.0/deps/uv/gyp_uv.py +--- node-v11.15.0-orig/deps/uv/gyp_uv.py 2019-04-30 20:31:27.000000000 +0300 ++++ node-v11.15.0/deps/uv/gyp_uv.py 2019-06-27 13:13:43.351219600 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import os import platform -diff --git a/deps/v8/DEPS b/deps/v8/DEPS -index 4b64895c..271892e9 100644 ---- a/deps/v8/DEPS -+++ b/deps/v8/DEPS -@@ -79,7 +79,7 @@ hooks = [ +diff -Naur node-v11.15.0-orig/deps/uv/tools/make_dist_html.py node-v11.15.0/deps/uv/tools/make_dist_html.py +--- node-v11.15.0-orig/deps/uv/tools/make_dist_html.py 2019-04-30 20:31:27.000000000 +0300 ++++ node-v11.15.0/deps/uv/tools/make_dist_html.py 2019-06-27 13:13:46.876224500 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + + from __future__ import print_function + +diff -Naur node-v11.15.0-orig/deps/v8/DEPS node-v11.15.0/deps/v8/DEPS +--- node-v11.15.0-orig/deps/v8/DEPS 2019-04-30 20:31:27.000000000 +0300 ++++ node-v11.15.0/deps/v8/DEPS 2019-06-27 13:13:48.121226200 +0300 +@@ -107,7 +107,7 @@ + 'name': 'disable_depot_tools_selfupdate', + 'pattern': '.', + 'action': [ +- 'python', ++ 'python2', + 'v8/third_party/depot_tools/update_depot_tools_toggle.py', + '--disable', + ], +@@ -119,7 +119,7 @@ 'name': 'landmines', 'pattern': '.', 'action': [ - 'python', + 'python2', - 'v8/gypfiles/landmines.py', - ], - }, -@@ -121,7 +121,7 @@ hooks = [ - 'name': 'gcmole', + 'v8/build/landmines.py', + '--landmine-scripts', + 'v8/tools/get_landmines.py', +@@ -284,35 +284,35 @@ + 'name': 'sysroot_arm', 'pattern': '.', - 'action': [ -- 'python', -+ 'python2', - 'v8/tools/gcmole/download_gcmole_tools.py', - ], + 'condition': '(checkout_linux and checkout_arm)', +- 'action': ['python', 'v8/build/linux/sysroot_scripts/install-sysroot.py', ++ 'action': ['python2', 'v8/build/linux/sysroot_scripts/install-sysroot.py', + '--arch=arm'], }, -@@ -129,7 +129,7 @@ hooks = [ - 'name': 'jsfunfuzz', + { + 'name': 'sysroot_arm64', 'pattern': '.', - 'action': [ -- 'python', -+ 'python2', - 'v8/tools/jsfunfuzz/download_jsfunfuzz.py', - ], + 'condition': '(checkout_linux and checkout_arm64)', +- 'action': ['python', 'v8/build/linux/sysroot_scripts/install-sysroot.py', ++ 'action': ['python2', 'v8/build/linux/sysroot_scripts/install-sysroot.py', + '--arch=arm64'], }, -@@ -249,7 +249,7 @@ hooks = [ - # Update the Windows toolchain if necessary. + { + 'name': 'sysroot_x86', + 'pattern': '.', + 'condition': '(checkout_linux and (checkout_x86 or checkout_x64))', +- 'action': ['python', 'v8/build/linux/sysroot_scripts/install-sysroot.py', ++ 'action': ['python2', 'v8/build/linux/sysroot_scripts/install-sysroot.py', + '--arch=x86'], + }, + { + 'name': 'sysroot_mips', + 'pattern': '.', + 'condition': '(checkout_linux and checkout_mips)', +- 'action': ['python', 'v8/build/linux/sysroot_scripts/install-sysroot.py', ++ 'action': ['python2', 'v8/build/linux/sysroot_scripts/install-sysroot.py', + '--arch=mips'], + }, + { + 'name': 'sysroot_x64', + 'pattern': '.', + 'condition': 'checkout_linux and checkout_x64', +- 'action': ['python', 'v8/build/linux/sysroot_scripts/install-sysroot.py', ++ 'action': ['python2', 'v8/build/linux/sysroot_scripts/install-sysroot.py', + '--arch=x64'], + }, + { +@@ -342,14 +342,14 @@ 'name': 'win_toolchain', 'pattern': '.', + 'condition': 'checkout_win', - 'action': ['python', 'v8/build/vs_toolchain.py', 'update'], + 'action': ['python2', 'v8/build/vs_toolchain.py', 'update'], + }, + { + # Update the Mac toolchain if necessary. + 'name': 'mac_toolchain', + 'pattern': '.', + 'condition': 'checkout_mac', +- 'action': ['python', 'v8/build/mac_toolchain.py'], ++ 'action': ['python2', 'v8/build/mac_toolchain.py'], }, # Pull binutils for linux, enabled debug fission for faster linking / # debugging when used with clang on Ubuntu Precise. -@@ -258,7 +258,7 @@ hooks = [ - 'name': 'binutils', +@@ -359,7 +359,7 @@ 'pattern': 'v8/third_party/binutils', + 'condition': 'host_os == "linux"', 'action': [ - 'python', + 'python2', 'v8/third_party/binutils/download.py', ], }, -@@ -267,11 +267,11 @@ hooks = [ - # Note: On Win, this should run after win_toolchain, as it may use it. - 'name': 'clang', +@@ -369,13 +369,13 @@ 'pattern': '.', -- 'action': ['python', 'v8/tools/clang/scripts/update.py', '--if-needed'], -+ 'action': ['python2', 'v8/tools/clang/scripts/update.py', '--if-needed'], + # clang not supported on aix + 'condition': 'host_os != "aix"', +- 'action': ['python', 'v8/tools/clang/scripts/update.py'], ++ 'action': ['python2', 'v8/tools/clang/scripts/update.py'], }, { - # A change to a .gyp, .gypi, or to GYP itself should run the generator. - "pattern": ".", -- "action": ["python", "v8/gypfiles/gyp_v8", "--running-as-hook"], -+ "action": ["python2", "v8/gypfiles/gyp_v8", "--running-as-hook"], + # Update LASTCHANGE. + 'name': 'lastchange', + 'pattern': '.', +- 'action': ['python', 'v8/build/util/lastchange.py', ++ 'action': ['python2', 'v8/build/util/lastchange.py', + '-o', 'v8/build/util/LASTCHANGE'], }, - ] -diff --git a/deps/v8/Makefile b/deps/v8/Makefile -index 167ebf8c..5f031c34 100644 ---- a/deps/v8/Makefile -+++ b/deps/v8/Makefile -@@ -318,7 +318,7 @@ $(ARCHES): $(addprefix $$@.,$(DEFAULT_MODES)) - $(BUILDS): $(OUTDIR)/Makefile.$$@ - @$(MAKE) -C "$(OUTDIR)" -f Makefile.$@ \ - BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \ -- python -c "print \ -+ python2 -c "print \ - raw_input().replace('opt', '').capitalize()") \ - builddir="$(shell pwd)/$(OUTDIR)/$@" - -diff --git a/deps/v8/Makefile.android b/deps/v8/Makefile.android -index 41715217..1f84adb7 100644 ---- a/deps/v8/Makefile.android -+++ b/deps/v8/Makefile.android -@@ -58,7 +58,7 @@ DEFINES += OS=android - $(ANDROID_BUILDS): $(OUTDIR)/Makefile.$$@ - @$(MAKE) -C "$(OUTDIR)" -f Makefile.$@ \ - BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \ -- python -c "print raw_input().capitalize()") \ -+ python2 -c "print raw_input().capitalize()") \ - builddir="$(shell pwd)/$(OUTDIR)/$@" - - # Android GYP file generation targets. -diff --git a/deps/v8/gypfiles/coverage_wrapper.py b/deps/v8/gypfiles/coverage_wrapper.py -index d5fdee43..ee26b8e6 100755 ---- a/deps/v8/gypfiles/coverage_wrapper.py -+++ b/deps/v8/gypfiles/coverage_wrapper.py + { +@@ -383,7 +383,7 @@ + 'pattern': '.', + 'condition': 'checkout_fuchsia', + 'action': [ +- 'python', ++ 'python2', + 'v8/build/fuchsia/update_sdk.py', + ], + }, +@@ -415,7 +415,7 @@ + 'pattern': '.', + 'condition': 'check_v8_header_includes', + 'action': [ +- 'python', ++ 'python2', + 'v8/tools/generate-header-include-checks.py', + ], + }, +diff -Naur node-v11.15.0-orig/deps/v8/gypfiles/cctest.gyp node-v11.15.0/deps/v8/gypfiles/cctest.gyp +--- node-v11.15.0-orig/deps/v8/gypfiles/cctest.gyp 2019-04-30 20:31:27.000000000 +0300 ++++ node-v11.15.0/deps/v8/gypfiles/cctest.gyp 2019-06-27 13:13:48.231226400 +0300 +@@ -438,7 +438,7 @@ + '<(generated_file)', + ], + 'action': [ +- 'python', ++ 'python2', + '../tools/js2c.py', + '<@(_outputs)', + 'TEST', # type +diff -Naur node-v11.15.0-orig/deps/v8/gypfiles/coverage_wrapper.py node-v11.15.0/deps/v8/gypfiles/coverage_wrapper.py +--- node-v11.15.0-orig/deps/v8/gypfiles/coverage_wrapper.py 2019-04-30 20:31:27.000000000 +0300 ++++ node-v11.15.0/deps/v8/gypfiles/coverage_wrapper.py 2019-06-27 13:13:48.261226400 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2016 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -diff --git a/deps/v8/gypfiles/detect_v8_host_arch.py b/deps/v8/gypfiles/detect_v8_host_arch.py -index 89e8286e..87ad3792 100644 ---- a/deps/v8/gypfiles/detect_v8_host_arch.py -+++ b/deps/v8/gypfiles/detect_v8_host_arch.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # Copyright 2014 the V8 project authors. All rights reserved. - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions are -diff --git a/deps/v8/gypfiles/get_landmines.py b/deps/v8/gypfiles/get_landmines.py -index 6137648e..69f29815 100755 ---- a/deps/v8/gypfiles/get_landmines.py -+++ b/deps/v8/gypfiles/get_landmines.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # Copyright 2014 the V8 project authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. -diff --git a/deps/v8/gypfiles/gyp_v8 b/deps/v8/gypfiles/gyp_v8 -index b8b5f742..a8715368 100755 ---- a/deps/v8/gypfiles/gyp_v8 -+++ b/deps/v8/gypfiles/gyp_v8 +diff -Naur node-v11.15.0-orig/deps/v8/gypfiles/d8.gyp node-v11.15.0/deps/v8/gypfiles/d8.gyp +--- node-v11.15.0-orig/deps/v8/gypfiles/d8.gyp 2019-04-30 20:31:27.000000000 +0300 ++++ node-v11.15.0/deps/v8/gypfiles/d8.gyp 2019-06-27 13:13:48.286226500 +0300 +@@ -109,7 +109,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc', + ], + 'action': [ +- 'python', ++ 'python2', + '../tools/js2c.py', + '<@(_outputs)', + 'D8', +diff -Naur node-v11.15.0-orig/deps/v8/gypfiles/gyp_v8 node-v11.15.0/deps/v8/gypfiles/gyp_v8 +--- node-v11.15.0-orig/deps/v8/gypfiles/gyp_v8 2019-04-30 20:31:27.000000000 +0300 ++++ node-v11.15.0/deps/v8/gypfiles/gyp_v8 2019-06-27 13:13:48.456226700 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Copyright 2012 the V8 project authors. All rights reserved. # Redistribution and use in source and binary forms, with or without -diff --git a/deps/v8/gypfiles/isolate.gypi b/deps/v8/gypfiles/isolate.gypi -index 149818c8..ba25cdc5 100644 ---- a/deps/v8/gypfiles/isolate.gypi -+++ b/deps/v8/gypfiles/isolate.gypi -@@ -52,7 +52,7 @@ - '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated', +diff -Naur node-v11.15.0-orig/deps/v8/gypfiles/inspector.gypi node-v11.15.0/deps/v8/gypfiles/inspector.gypi +--- node-v11.15.0-orig/deps/v8/gypfiles/inspector.gypi 2019-04-30 20:31:27.000000000 +0300 ++++ node-v11.15.0/deps/v8/gypfiles/inspector.gypi 2019-06-27 13:13:48.536226800 +0300 +@@ -101,7 +101,7 @@ + '<@(SHARED_INTERMEDIATE_DIR)/src/js_protocol.stamp', ], 'action': [ - 'python', + 'python2', - '<(DEPTH)/tools/isolate_driver.py', - '<(test_isolation_mode)', - '--isolated', '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated', -diff --git a/deps/v8/gypfiles/landmines.py b/deps/v8/gypfiles/landmines.py -index 2a81c66d..49901b10 100755 ---- a/deps/v8/gypfiles/landmines.py -+++ b/deps/v8/gypfiles/landmines.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # Copyright 2014 the V8 project authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. -diff --git a/deps/v8/gypfiles/run-tests-legacy.py b/deps/v8/gypfiles/run-tests-legacy.py -index f1ea478c..4391c375 100755 ---- a/deps/v8/gypfiles/run-tests-legacy.py -+++ b/deps/v8/gypfiles/run-tests-legacy.py + '<(protocol_path)/CheckProtocolCompatibility.py', + '--stamp', '<@(_outputs)', + '<(inspector_path)/js_protocol.json', +@@ -120,7 +120,7 @@ + ], + 'process_outputs_as_sources': 1, + 'action': [ +- 'python', ++ 'python2', + '<(protocol_path)/CodeGenerator.py', + '--jinja_dir', '../third_party', + '--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/inspector', +@@ -139,7 +139,7 @@ + ], + 'process_outputs_as_sources': 1, + 'action': [ +- 'python', ++ 'python2', + '<(inspector_path)/build/xxd.py', + 'InjectedScriptSource_js', + '<(inspector_path)/injected-script-source.js', +diff -Naur node-v11.15.0-orig/deps/v8/gypfiles/run-tests-legacy.py node-v11.15.0/deps/v8/gypfiles/run-tests-legacy.py +--- node-v11.15.0-orig/deps/v8/gypfiles/run-tests-legacy.py 2019-04-30 20:31:27.000000000 +0300 ++++ node-v11.15.0/deps/v8/gypfiles/run-tests-legacy.py 2019-06-27 13:13:48.696227000 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2017 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -diff --git a/deps/v8/gypfiles/shim_headers.gypi b/deps/v8/gypfiles/shim_headers.gypi -index 940211c2..7e21773c 100644 ---- a/deps/v8/gypfiles/shim_headers.gypi -+++ b/deps/v8/gypfiles/shim_headers.gypi +diff -Naur node-v11.15.0-orig/deps/v8/gypfiles/shim_headers.gypi node-v11.15.0/deps/v8/gypfiles/shim_headers.gypi +--- node-v11.15.0-orig/deps/v8/gypfiles/shim_headers.gypi 2019-04-30 20:31:27.000000000 +0300 ++++ node-v11.15.0/deps/v8/gypfiles/shim_headers.gypi 2019-06-27 13:13:48.781227200 +0300 @@ -62,7 +62,7 @@ 'outputs': [ ' tools/gyp/gyp.mingw << EOF --#!/usr/bin/env python -+#!/usr/bin/env python2 + if cmd[0] == self.executable: +- cmd = ['python'] + cmd[1:] ++ cmd = ['python2'] + cmd[1:] + self.Print(*[shell_quoter(arg) for arg in cmd]) - # Copyright (c) 2009 Google Inc. All rights reserved. + def PrintJSON(self, obj): +diff -Naur node-v11.15.0-orig/deps/v8/tools/mb/mb_unittest.py node-v11.15.0/deps/v8/tools/mb/mb_unittest.py +--- node-v11.15.0-orig/deps/v8/tools/mb/mb_unittest.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/mb/mb_unittest.py 2019-06-27 13:14:45.486306500 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # Copyright 2016 the V8 project authors. All rights reserved. + # Copyright 2015 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be -diff --git a/deps/v8/tools/perf-to-html.py b/deps/v8/tools/perf-to-html.py -index 7ec9c50f..6c14287d 100755 ---- a/deps/v8/tools/perf-to-html.py -+++ b/deps/v8/tools/perf-to-html.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/node/backport_node.py node-v11.15.0/deps/v8/tools/node/backport_node.py +--- node-v11.15.0-orig/deps/v8/tools/node/backport_node.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/node/backport_node.py 2019-06-27 13:14:45.776306900 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/node/build_gn.py node-v11.15.0/deps/v8/tools/node/build_gn.py +--- node-v11.15.0-orig/deps/v8/tools/node/build_gn.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/node/build_gn.py 2019-06-27 13:14:45.806307000 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/node/fetch_deps.py node-v11.15.0/deps/v8/tools/node/fetch_deps.py +--- node-v11.15.0-orig/deps/v8/tools/node/fetch_deps.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/node/fetch_deps.py 2019-06-27 13:14:45.836307000 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/node/node_common.py node-v11.15.0/deps/v8/tools/node/node_common.py +--- node-v11.15.0-orig/deps/v8/tools/node/node_common.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/node/node_common.py 2019-06-27 13:14:45.866307100 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/node/test_backport_node.py node-v11.15.0/deps/v8/tools/node/test_backport_node.py +--- node-v11.15.0-orig/deps/v8/tools/node/test_backport_node.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/node/test_backport_node.py 2019-06-27 13:14:46.416307800 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/node/test_update_node.py node-v11.15.0/deps/v8/tools/node/test_update_node.py +--- node-v11.15.0-orig/deps/v8/tools/node/test_update_node.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/node/test_update_node.py 2019-06-27 13:14:46.446307900 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/node/update_node.py node-v11.15.0/deps/v8/tools/node/update_node.py +--- node-v11.15.0-orig/deps/v8/tools/node/update_node.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/node/update_node.py 2019-06-27 13:14:46.471307900 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/objdump-v8 node-v11.15.0/deps/v8/tools/objdump-v8 +--- node-v11.15.0-orig/deps/v8/tools/objdump-v8 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/objdump-v8 2019-06-27 13:14:46.501308000 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2016 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur node-v11.15.0-orig/deps/v8/tools/perf-compare.py node-v11.15.0/deps/v8/tools/perf-compare.py +--- node-v11.15.0-orig/deps/v8/tools/perf-compare.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/perf-compare.py 2019-06-27 13:14:46.696308200 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/perf-to-html.py node-v11.15.0/deps/v8/tools/perf-to-html.py +--- node-v11.15.0-orig/deps/v8/tools/perf-to-html.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/perf-to-html.py 2019-06-27 13:14:46.721308300 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2015 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -diff --git a/deps/v8/tools/presubmit.py b/deps/v8/tools/presubmit.py -index 99486cce..01973e47 100755 ---- a/deps/v8/tools/presubmit.py -+++ b/deps/v8/tools/presubmit.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/predictable_wrapper.py node-v11.15.0/deps/v8/tools/predictable_wrapper.py +--- node-v11.15.0-orig/deps/v8/tools/predictable_wrapper.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/predictable_wrapper.py 2019-06-27 13:14:46.781308400 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 - # - # Copyright 2012 the V8 project authors. All rights reserved. - # Redistribution and use in source and binary forms, with or without -diff --git a/deps/v8/tools/process-heap-prof.py b/deps/v8/tools/process-heap-prof.py -index a26cbf15..c7a4e6e5 100755 ---- a/deps/v8/tools/process-heap-prof.py -+++ b/deps/v8/tools/process-heap-prof.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # - # Copyright 2009 the V8 project authors. All rights reserved. - # Redistribution and use in source and binary forms, with or without -diff --git a/deps/v8/tools/release/auto_push.py b/deps/v8/tools/release/auto_push.py -index ca9e5e87..5b91dec6 100755 ---- a/deps/v8/tools/release/auto_push.py -+++ b/deps/v8/tools/release/auto_push.py + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/auto_push.py node-v11.15.0/deps/v8/tools/release/auto_push.py +--- node-v11.15.0-orig/deps/v8/tools/release/auto_push.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/auto_push.py 2019-06-27 13:14:46.991308600 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2013 the V8 project authors. All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are -diff --git a/deps/v8/tools/release/auto_roll.py b/deps/v8/tools/release/auto_roll.py -index da4cc7ef..7b02e06f 100755 ---- a/deps/v8/tools/release/auto_roll.py -+++ b/deps/v8/tools/release/auto_roll.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/auto_roll.py node-v11.15.0/deps/v8/tools/release/auto_roll.py +--- node-v11.15.0-orig/deps/v8/tools/release/auto_roll.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/auto_roll.py 2019-06-27 13:14:47.031308700 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2014 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -diff --git a/deps/v8/tools/release/auto_tag.py b/deps/v8/tools/release/auto_tag.py -index a52a0286..b71c19cd 100755 ---- a/deps/v8/tools/release/auto_tag.py -+++ b/deps/v8/tools/release/auto_tag.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/auto_tag.py node-v11.15.0/deps/v8/tools/release/auto_tag.py +--- node-v11.15.0-orig/deps/v8/tools/release/auto_tag.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/auto_tag.py 2019-06-27 13:14:47.056308700 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2014 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -diff --git a/deps/v8/tools/release/check_clusterfuzz.py b/deps/v8/tools/release/check_clusterfuzz.py -index 0fdffd93..213a2fc1 100755 ---- a/deps/v8/tools/release/check_clusterfuzz.py -+++ b/deps/v8/tools/release/check_clusterfuzz.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/check_clusterfuzz.py node-v11.15.0/deps/v8/tools/release/check_clusterfuzz.py +--- node-v11.15.0-orig/deps/v8/tools/release/check_clusterfuzz.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/check_clusterfuzz.py 2019-06-27 13:14:47.086308800 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2014 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -diff --git a/deps/v8/tools/release/common_includes.py b/deps/v8/tools/release/common_includes.py -index d295e37d..6af45662 100644 ---- a/deps/v8/tools/release/common_includes.py -+++ b/deps/v8/tools/release/common_includes.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/common_includes.py node-v11.15.0/deps/v8/tools/release/common_includes.py +--- node-v11.15.0-orig/deps/v8/tools/release/common_includes.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/common_includes.py 2019-06-27 13:14:47.116308800 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2013 the V8 project authors. All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are -diff --git a/deps/v8/tools/release/create_release.py b/deps/v8/tools/release/create_release.py -index e5c2114b..48d713a3 100755 ---- a/deps/v8/tools/release/create_release.py -+++ b/deps/v8/tools/release/create_release.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/create_release.py node-v11.15.0/deps/v8/tools/release/create_release.py +--- node-v11.15.0-orig/deps/v8/tools/release/create_release.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/create_release.py 2019-06-27 13:14:47.146308900 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2015 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -diff --git a/deps/v8/tools/release/git_recipes.py b/deps/v8/tools/release/git_recipes.py -index d831aa3a..de8d032d 100644 ---- a/deps/v8/tools/release/git_recipes.py -+++ b/deps/v8/tools/release/git_recipes.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/filter_build_files.py node-v11.15.0/deps/v8/tools/release/filter_build_files.py +--- node-v11.15.0-orig/deps/v8/tools/release/filter_build_files.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/filter_build_files.py 2019-06-27 13:14:47.171308900 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/git_recipes.py node-v11.15.0/deps/v8/tools/release/git_recipes.py +--- node-v11.15.0-orig/deps/v8/tools/release/git_recipes.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/git_recipes.py 2019-06-27 13:14:47.201308900 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2014 the V8 project authors. All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are -diff --git a/deps/v8/tools/release/merge_to_branch.py b/deps/v8/tools/release/merge_to_branch.py -index 877d121b..5fa337b7 100755 ---- a/deps/v8/tools/release/merge_to_branch.py -+++ b/deps/v8/tools/release/merge_to_branch.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/merge_to_branch.py node-v11.15.0/deps/v8/tools/release/merge_to_branch.py +--- node-v11.15.0-orig/deps/v8/tools/release/merge_to_branch.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/merge_to_branch.py 2019-06-27 13:14:47.256309000 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2014 the V8 project authors. All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are -diff --git a/deps/v8/tools/release/mergeinfo.py b/deps/v8/tools/release/mergeinfo.py -index 1e29ece9..b28f5e1a 100755 ---- a/deps/v8/tools/release/mergeinfo.py -+++ b/deps/v8/tools/release/mergeinfo.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/mergeinfo.py node-v11.15.0/deps/v8/tools/release/mergeinfo.py +--- node-v11.15.0-orig/deps/v8/tools/release/mergeinfo.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/mergeinfo.py 2019-06-27 13:14:47.226309000 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2015 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -diff --git a/deps/v8/tools/release/push_to_candidates.py b/deps/v8/tools/release/push_to_candidates.py -index 538b9887..cf02a884 100755 ---- a/deps/v8/tools/release/push_to_candidates.py -+++ b/deps/v8/tools/release/push_to_candidates.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/push_to_candidates.py node-v11.15.0/deps/v8/tools/release/push_to_candidates.py +--- node-v11.15.0-orig/deps/v8/tools/release/push_to_candidates.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/push_to_candidates.py 2019-06-27 13:14:47.311309100 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2013 the V8 project authors. All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are -diff --git a/deps/v8/tools/release/releases.py b/deps/v8/tools/release/releases.py -index 7b659ccb..61b2eecb 100755 ---- a/deps/v8/tools/release/releases.py -+++ b/deps/v8/tools/release/releases.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # Copyright 2014 the V8 project authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. -diff --git a/deps/v8/tools/release/script_test.py b/deps/v8/tools/release/script_test.py -index b9a17e97..3e16eb6c 100755 ---- a/deps/v8/tools/release/script_test.py -+++ b/deps/v8/tools/release/script_test.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/roll_merge.py node-v11.15.0/deps/v8/tools/release/roll_merge.py +--- node-v11.15.0-orig/deps/v8/tools/release/roll_merge.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/roll_merge.py 2019-06-27 13:14:47.341309100 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2014 the V8 project authors. All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are -diff --git a/deps/v8/tools/release/search_related_commits.py b/deps/v8/tools/release/search_related_commits.py -index d27aa56f..bf016d17 100755 ---- a/deps/v8/tools/release/search_related_commits.py -+++ b/deps/v8/tools/release/search_related_commits.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/script_test.py node-v11.15.0/deps/v8/tools/release/script_test.py +--- node-v11.15.0-orig/deps/v8/tools/release/script_test.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/script_test.py 2019-06-27 13:14:47.366309200 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2014 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without + # modification, are permitted provided that the following conditions are +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/search_related_commits.py node-v11.15.0/deps/v8/tools/release/search_related_commits.py +--- node-v11.15.0-orig/deps/v8/tools/release/search_related_commits.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/search_related_commits.py 2019-06-27 13:14:47.396309200 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2015 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -diff --git a/deps/v8/tools/release/test_scripts.py b/deps/v8/tools/release/test_scripts.py -index 42bbd5a0..10fd6083 100755 ---- a/deps/v8/tools/release/test_scripts.py -+++ b/deps/v8/tools/release/test_scripts.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/test_mergeinfo.py node-v11.15.0/deps/v8/tools/release/test_mergeinfo.py +--- node-v11.15.0-orig/deps/v8/tools/release/test_mergeinfo.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/test_mergeinfo.py 2019-06-27 13:14:47.536309400 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2015 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/test_scripts.py node-v11.15.0/deps/v8/tools/release/test_scripts.py +--- node-v11.15.0-orig/deps/v8/tools/release/test_scripts.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/test_scripts.py 2019-06-27 13:14:47.566309500 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2013 the V8 project authors. All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are -diff --git a/deps/v8/tools/release/test_search_related_commits.py b/deps/v8/tools/release/test_search_related_commits.py -index cf612361..3eca10e8 100755 ---- a/deps/v8/tools/release/test_search_related_commits.py -+++ b/deps/v8/tools/release/test_search_related_commits.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/release/test_search_related_commits.py node-v11.15.0/deps/v8/tools/release/test_search_related_commits.py +--- node-v11.15.0-orig/deps/v8/tools/release/test_search_related_commits.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/release/test_search_related_commits.py 2019-06-27 13:14:47.591309500 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2015 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -diff --git a/deps/v8/tools/run-deopt-fuzzer.py b/deps/v8/tools/run-deopt-fuzzer.py -index 1f50e026..befa7b3b 100755 ---- a/deps/v8/tools/run-deopt-fuzzer.py -+++ b/deps/v8/tools/run-deopt-fuzzer.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/run.py node-v11.15.0/deps/v8/tools/run.py +--- node-v11.15.0-orig/deps/v8/tools/run.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/run.py 2019-06-27 13:14:47.726309700 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2014 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/run_perf.py node-v11.15.0/deps/v8/tools/run_perf.py +--- node-v11.15.0-orig/deps/v8/tools/run_perf.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/run_perf.py 2019-06-27 13:14:47.756309700 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2014 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/run-num-fuzzer.py node-v11.15.0/deps/v8/tools/run-num-fuzzer.py +--- node-v11.15.0-orig/deps/v8/tools/run-num-fuzzer.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/run-num-fuzzer.py 2019-06-27 13:14:47.646309600 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # - # Copyright 2012 the V8 project authors. All rights reserved. - # Redistribution and use in source and binary forms, with or without -diff --git a/deps/v8/tools/run-valgrind.py b/deps/v8/tools/run-valgrind.py -index e3f84f58..de783004 100755 ---- a/deps/v8/tools/run-valgrind.py -+++ b/deps/v8/tools/run-valgrind.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # - # Copyright 2009 the V8 project authors. All rights reserved. - # Redistribution and use in source and binary forms, with or without -diff --git a/deps/v8/tools/run.py b/deps/v8/tools/run.py -index 5a656e19..c6fc5894 100755 ---- a/deps/v8/tools/run.py -+++ b/deps/v8/tools/run.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # Copyright 2014 the V8 project authors. All rights reserved. + # Copyright 2018 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. -diff --git a/deps/v8/tools/run_perf.py b/deps/v8/tools/run_perf.py -index b22a4f11..76ee8c5b 100755 ---- a/deps/v8/tools/run_perf.py -+++ b/deps/v8/tools/run_perf.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # Copyright 2014 the V8 project authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. -diff --git a/deps/v8/tools/sanitizers/sancov_formatter.py b/deps/v8/tools/sanitizers/sancov_formatter.py -index 2e168fb0..71fe8e67 100755 ---- a/deps/v8/tools/sanitizers/sancov_formatter.py -+++ b/deps/v8/tools/sanitizers/sancov_formatter.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/sanitizers/sancov_formatter.py node-v11.15.0/deps/v8/tools/sanitizers/sancov_formatter.py +--- node-v11.15.0-orig/deps/v8/tools/sanitizers/sancov_formatter.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/sanitizers/sancov_formatter.py 2019-06-27 13:14:47.786309800 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2016 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -diff --git a/deps/v8/tools/sanitizers/sancov_merger.py b/deps/v8/tools/sanitizers/sancov_merger.py -index 867f8b42..7e256437 100755 ---- a/deps/v8/tools/sanitizers/sancov_merger.py -+++ b/deps/v8/tools/sanitizers/sancov_merger.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/sanitizers/sancov_merger.py node-v11.15.0/deps/v8/tools/sanitizers/sancov_merger.py +--- node-v11.15.0-orig/deps/v8/tools/sanitizers/sancov_merger.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/sanitizers/sancov_merger.py 2019-06-27 13:14:47.841309800 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2016 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -diff --git a/deps/v8/tools/sanitizers/sanitize_pcs.py b/deps/v8/tools/sanitizers/sanitize_pcs.py -index 47f27150..df58ff6b 100755 ---- a/deps/v8/tools/sanitizers/sanitize_pcs.py -+++ b/deps/v8/tools/sanitizers/sanitize_pcs.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/sanitizers/sanitize_pcs.py node-v11.15.0/deps/v8/tools/sanitizers/sanitize_pcs.py +--- node-v11.15.0-orig/deps/v8/tools/sanitizers/sanitize_pcs.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/sanitizers/sanitize_pcs.py 2019-06-27 13:14:47.896309900 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2016 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -diff --git a/deps/v8/tools/stats-viewer.py b/deps/v8/tools/stats-viewer.py -index e8fc69e3..89b0da62 100755 ---- a/deps/v8/tools/stats-viewer.py -+++ b/deps/v8/tools/stats-viewer.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/stats-viewer.py node-v11.15.0/deps/v8/tools/stats-viewer.py +--- node-v11.15.0-orig/deps/v8/tools/stats-viewer.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/stats-viewer.py 2019-06-27 13:14:48.116310200 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Copyright 2008 the V8 project authors. All rights reserved. # Redistribution and use in source and binary forms, with or without -diff --git a/deps/v8/tools/test-server.py b/deps/v8/tools/test-server.py -index ab927de7..a94b61ad 100755 ---- a/deps/v8/tools/test-server.py -+++ b/deps/v8/tools/test-server.py +diff -Naur node-v11.15.0-orig/deps/v8/tools/testrunner/local/pool.py node-v11.15.0/deps/v8/tools/testrunner/local/pool.py +--- node-v11.15.0-orig/deps/v8/tools/testrunner/local/pool.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/testrunner/local/pool.py 2019-06-27 13:14:48.286310500 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2014 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/testrunner/local/pool_unittest.py node-v11.15.0/deps/v8/tools/testrunner/local/pool_unittest.py +--- node-v11.15.0-orig/deps/v8/tools/testrunner/local/pool_unittest.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/testrunner/local/pool_unittest.py 2019-06-27 13:14:48.311310500 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2014 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/testrunner/local/statusfile_unittest.py node-v11.15.0/deps/v8/tools/testrunner/local/statusfile_unittest.py +--- node-v11.15.0-orig/deps/v8/tools/testrunner/local/statusfile_unittest.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/testrunner/local/statusfile_unittest.py 2019-06-27 13:14:48.371310600 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2016 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/testrunner/local/testsuite_unittest.py node-v11.15.0/deps/v8/tools/testrunner/local/testsuite_unittest.py +--- node-v11.15.0-orig/deps/v8/tools/testrunner/local/testsuite_unittest.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/testrunner/local/testsuite_unittest.py 2019-06-27 13:14:48.426310700 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2016 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/testrunner/num_fuzzer.py node-v11.15.0/deps/v8/tools/testrunner/num_fuzzer.py +--- node-v11.15.0-orig/deps/v8/tools/testrunner/num_fuzzer.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/testrunner/num_fuzzer.py 2019-06-27 13:14:48.561310800 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/v8/tools/testrunner/standard_runner.py node-v11.15.0/deps/v8/tools/testrunner/standard_runner.py +--- node-v11.15.0-orig/deps/v8/tools/testrunner/standard_runner.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/testrunner/standard_runner.py 2019-06-27 13:14:48.916311300 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/deps/v8/tools/torque/format-torque.py node-v11.15.0/deps/v8/tools/torque/format-torque.py +--- node-v11.15.0-orig/deps/v8/tools/torque/format-torque.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/torque/format-torque.py 2019-06-27 13:14:49.746312500 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2014 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/torque/make-torque-parser.py node-v11.15.0/deps/v8/tools/torque/make-torque-parser.py +--- node-v11.15.0-orig/deps/v8/tools/torque/make-torque-parser.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/torque/make-torque-parser.py 2019-06-27 13:14:49.771312500 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2014 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/trace-maps-processor.py node-v11.15.0/deps/v8/tools/trace-maps-processor.py +--- node-v11.15.0-orig/deps/v8/tools/trace-maps-processor.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/trace-maps-processor.py 2019-06-27 13:14:49.986312800 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2014 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/try_perf.py node-v11.15.0/deps/v8/tools/try_perf.py +--- node-v11.15.0-orig/deps/v8/tools/try_perf.py 2019-04-30 20:31:46.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/try_perf.py 2019-06-27 13:14:50.011312900 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2014 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/unittests/predictable_wrapper_test.py node-v11.15.0/deps/v8/tools/unittests/predictable_wrapper_test.py +--- node-v11.15.0-orig/deps/v8/tools/unittests/predictable_wrapper_test.py 2019-04-30 20:31:47.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/unittests/predictable_wrapper_test.py 2019-06-27 13:14:51.446314900 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/unittests/run_perf_test.py node-v11.15.0/deps/v8/tools/unittests/run_perf_test.py +--- node-v11.15.0-orig/deps/v8/tools/unittests/run_perf_test.py 2019-04-30 20:31:47.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/unittests/run_perf_test.py 2019-06-27 13:14:51.511315000 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2014 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/unittests/run_tests_test.py node-v11.15.0/deps/v8/tools/unittests/run_tests_test.py +--- node-v11.15.0-orig/deps/v8/tools/unittests/run_tests_test.py 2019-04-30 20:31:47.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/unittests/run_tests_test.py 2019-06-27 13:14:51.541315000 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/unittests/testdata/d8_mocked1.py node-v11.15.0/deps/v8/tools/unittests/testdata/d8_mocked1.py +--- node-v11.15.0-orig/deps/v8/tools/unittests/testdata/d8_mocked1.py 2019-04-30 20:31:47.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/unittests/testdata/d8_mocked1.py 2019-06-27 13:14:51.571315100 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/unittests/testdata/d8_mocked2.py node-v11.15.0/deps/v8/tools/unittests/testdata/d8_mocked2.py +--- node-v11.15.0-orig/deps/v8/tools/unittests/testdata/d8_mocked2.py 2019-04-30 20:31:47.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/unittests/testdata/d8_mocked2.py 2019-06-27 13:14:51.601315100 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/unittests/testdata/predictable_mocked.py node-v11.15.0/deps/v8/tools/unittests/testdata/predictable_mocked.py +--- node-v11.15.0-orig/deps/v8/tools/unittests/testdata/predictable_mocked.py 2019-04-30 20:31:47.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/unittests/testdata/predictable_mocked.py 2019-06-27 13:14:51.686315200 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/unittests/testdata/results_processor.py node-v11.15.0/deps/v8/tools/unittests/testdata/results_processor.py +--- node-v11.15.0-orig/deps/v8/tools/unittests/testdata/results_processor.py 2019-04-30 20:31:47.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/unittests/testdata/results_processor.py 2019-06-27 13:14:51.711315300 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 the V8 project authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/deps/v8/tools/v8_presubmit.py node-v11.15.0/deps/v8/tools/v8_presubmit.py +--- node-v11.15.0-orig/deps/v8/tools/v8_presubmit.py 2019-04-30 20:31:47.000000000 +0300 ++++ node-v11.15.0/deps/v8/tools/v8_presubmit.py 2019-06-27 13:14:52.076315800 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Copyright 2012 the V8 project authors. All rights reserved. # Redistribution and use in source and binary forms, with or without -diff --git a/deps/v8/tools/testrunner/local/pool.py b/deps/v8/tools/testrunner/local/pool.py -index 99996ee3..4682378e 100644 ---- a/deps/v8/tools/testrunner/local/pool.py -+++ b/deps/v8/tools/testrunner/local/pool.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # Copyright 2014 the V8 project authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. -diff --git a/deps/v8/tools/testrunner/local/pool_unittest.py b/deps/v8/tools/testrunner/local/pool_unittest.py -index 235eca63..3b584157 100644 ---- a/deps/v8/tools/testrunner/local/pool_unittest.py -+++ b/deps/v8/tools/testrunner/local/pool_unittest.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # Copyright 2014 the V8 project authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. -diff --git a/deps/v8/tools/testrunner/server/daemon.py b/deps/v8/tools/testrunner/server/daemon.py -index baa66fbe..26a58c8c 100644 ---- a/deps/v8/tools/testrunner/server/daemon.py -+++ b/deps/v8/tools/testrunner/server/daemon.py +diff -Naur node-v11.15.0-orig/node.gyp node-v11.15.0/node.gyp +--- node-v11.15.0-orig/node.gyp 2019-04-30 20:31:48.000000000 +0300 ++++ node-v11.15.0/node.gyp 2019-06-27 13:15:06.666336200 +0300 +@@ -738,7 +738,7 @@ + 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/openssl.def'], + 'process_outputs_as_sources': 1, + 'action': [ +- 'python', ++ 'python2', + 'tools/mkssldef.py', + '<@(mkssldef_flags)', + '-o', +@@ -773,7 +773,7 @@ + }] + ], + 'action': [ +- 'python', 'tools/js2c.py', ++ 'python2', 'tools/js2c.py', + '<@(_outputs)', + '<@(_inputs)', + ], +diff -Naur node-v11.15.0-orig/src/inspector/node_inspector.gypi node-v11.15.0/src/inspector/node_inspector.gypi +--- node-v11.15.0-orig/src/inspector/node_inspector.gypi 2019-04-30 20:31:48.000000000 +0300 ++++ node-v11.15.0/src/inspector/node_inspector.gypi 2019-06-27 13:15:07.701337600 +0300 +@@ -76,7 +76,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/src/node_protocol.json', + ], + 'action': [ +- 'python', ++ 'python2', + 'tools/inspector_protocol/convert_protocol_to_json.py', + '<@(_inputs)', + '<@(_outputs)', +@@ -94,7 +94,7 @@ + ], + 'process_outputs_as_sources': 1, + 'action': [ +- 'python', ++ 'python2', + 'tools/inspector_protocol/code_generator.py', + '--jinja_dir', '<@(protocol_tool_path)/..', + '--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/', +@@ -112,7 +112,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/concatenated_protocol.json', + ], + 'action': [ +- 'python', ++ 'python2', + 'tools/inspector_protocol/concatenate_protocols.py', + '<@(_inputs)', + '<@(_outputs)', +@@ -128,7 +128,7 @@ + ], + 'process_outputs_as_sources': 1, + 'action': [ +- 'python', ++ 'python2', + 'tools/compress_json.py', + '<@(_inputs)', + '<@(_outputs)', +diff -Naur node-v11.15.0-orig/test/parallel/test-child-process-set-blocking.js node-v11.15.0/test/parallel/test-child-process-set-blocking.js +--- node-v11.15.0-orig/test/parallel/test-child-process-set-blocking.js 2019-04-30 20:31:52.000000000 +0300 ++++ node-v11.15.0/test/parallel/test-child-process-set-blocking.js 2019-06-27 13:17:58.491576700 +0300 +@@ -26,7 +26,7 @@ + + const SIZE = 100000; + +-const cp = ch.spawn('python', ['-c', `print ${SIZE} * "C"`], { ++const cp = ch.spawn('python2', ['-c', `print ${SIZE} * "C"`], { + stdio: 'inherit' + }); + +diff -Naur node-v11.15.0-orig/test/parallel/test-stdio-closed.js node-v11.15.0/test/parallel/test-stdio-closed.js +--- node-v11.15.0-orig/test/parallel/test-stdio-closed.js 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/test/parallel/test-stdio-closed.js 2019-06-27 13:18:37.291631100 +0300 +@@ -12,7 +12,7 @@ + process.stderr; + return; + } +- const python = process.env.PYTHON || 'python'; ++ const python2 = process.env.PYTHON || 'python2'; + const script = fixtures.path('spawn_closed_stdio.py'); + const proc = spawn(python, [script, process.execPath, __filename, 'child']); + proc.on('exit', common.mustCall(function(exitCode) { +diff -Naur node-v11.15.0-orig/test/pseudo-tty/no_dropped_stdio.js node-v11.15.0/test/pseudo-tty/no_dropped_stdio.js +--- node-v11.15.0-orig/test/pseudo-tty/no_dropped_stdio.js 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/test/pseudo-tty/no_dropped_stdio.js 2019-06-27 13:18:54.741655500 +0300 +@@ -11,7 +11,7 @@ + // This results in 1025 bytes, just enough to overflow the 1kb OS X TTY buffer. + out += `${'o'.repeat(24)}O`; + +-// In AIX, the child exits even before the python parent ++// In AIX, the child exits even before the python2 parent + // can setup the readloop. Provide a reasonable delay. + setTimeout(function() { + process.stdout.write(out); +diff -Naur node-v11.15.0-orig/test/pseudo-tty/no_interleaved_stdio.js node-v11.15.0/test/pseudo-tty/no_interleaved_stdio.js +--- node-v11.15.0-orig/test/pseudo-tty/no_interleaved_stdio.js 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/test/pseudo-tty/no_interleaved_stdio.js 2019-06-27 13:18:54.796655600 +0300 +@@ -13,7 +13,7 @@ + + const err = '__This is some stderr__'; + +-// In AIX, the child exits even before the python parent ++// In AIX, the child exits even before the python2 parent + // can setup the readloop. Provide a reasonable delay. + setTimeout(function() { + process.stdout.write(out); +diff -Naur node-v11.15.0-orig/test/pseudo-tty/test-stderr-stdout-handle-sigwinch.js node-v11.15.0/test/pseudo-tty/test-stderr-stdout-handle-sigwinch.js +--- node-v11.15.0-orig/test/pseudo-tty/test-stderr-stdout-handle-sigwinch.js 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/test/pseudo-tty/test-stderr-stdout-handle-sigwinch.js 2019-06-27 13:18:55.466656500 +0300 +@@ -27,7 +27,7 @@ + process.stdout, + 'calling stdout._refreshSize'); + +-// In AIX, the child exits even before the python parent ++// In AIX, the child exits even before the python2 parent + // can setup the readloop. Provide a reasonable delay. + setTimeout(function() { + process.emit('SIGWINCH'); +diff -Naur node-v11.15.0-orig/test/pummel/test-child-process-spawn-loop.js node-v11.15.0/test/pummel/test-child-process-spawn-loop.js +--- node-v11.15.0-orig/test/pummel/test-child-process-spawn-loop.js 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/test/pummel/test-child-process-spawn-loop.js 2019-06-27 13:18:56.191657500 +0300 +@@ -30,7 +30,7 @@ + let finished = false; + + function doSpawn(i) { +- const child = spawn('python', ['-c', `print ${SIZE} * "C"`]); ++ const child = spawn('python2', ['-c', `print ${SIZE} * "C"`]); + let count = 0; + + child.stdout.setEncoding('ascii'); +diff -Naur node-v11.15.0-orig/tools/check-imports.py node-v11.15.0/tools/check-imports.py +--- node-v11.15.0-orig/tools/check-imports.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/check-imports.py 2019-06-27 13:17:06.991504600 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 - # This code has been written by Sander Marechal and published at: - # http://www.jejik.com/articles/2007/02/a_simple_unix_linux_daemon_in_python/ -diff --git a/deps/v8/tools/trace-maps-processor.py b/deps/v8/tools/trace-maps-processor.py -index bf8c8a8c..33979984 100755 ---- a/deps/v8/tools/trace-maps-processor.py -+++ b/deps/v8/tools/trace-maps-processor.py + from __future__ import print_function + import glob +diff -Naur node-v11.15.0-orig/tools/compress_json.py node-v11.15.0/tools/compress_json.py +--- node-v11.15.0-orig/tools/compress_json.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/compress_json.py 2019-06-27 13:17:07.101504800 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 - # Copyright 2014 the V8 project authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. -diff --git a/deps/v8/tools/try_perf.py b/deps/v8/tools/try_perf.py -index 17eb0706..10e8da42 100755 ---- a/deps/v8/tools/try_perf.py -+++ b/deps/v8/tools/try_perf.py + + import json + import struct +diff -Naur node-v11.15.0-orig/tools/configure.d/nodedownload.py node-v11.15.0/tools/configure.d/nodedownload.py +--- node-v11.15.0-orig/tools/configure.d/nodedownload.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/configure.d/nodedownload.py 2019-06-27 13:17:07.126504800 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 - # Copyright 2014 the V8 project authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. -diff --git a/deps/v8/tools/unittests/run_perf_test.py b/deps/v8/tools/unittests/run_perf_test.py -index e7342e6a..c43f2b0d 100644 ---- a/deps/v8/tools/unittests/run_perf_test.py -+++ b/deps/v8/tools/unittests/run_perf_test.py + # Moved some utilities here from ../../configure + + from __future__ import print_function +diff -Naur node-v11.15.0-orig/tools/genv8constants.py node-v11.15.0/tools/genv8constants.py +--- node-v11.15.0-orig/tools/genv8constants.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/genv8constants.py 2019-06-27 13:17:07.651505600 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 - # Copyright 2014 the V8 project authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. -diff --git a/deps/v8/tools/verify_source_deps.py b/deps/v8/tools/verify_source_deps.py -index c49d51ab..7ddfe702 100755 ---- a/deps/v8/tools/verify_source_deps.py -+++ b/deps/v8/tools/verify_source_deps.py + + # + # genv8constants.py output_file libv8_base.a +diff -Naur node-v11.15.0-orig/tools/gyp/buildbot/buildbot_run.py node-v11.15.0/tools/gyp/buildbot/buildbot_run.py +--- node-v11.15.0-orig/tools/gyp/buildbot/buildbot_run.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/buildbot/buildbot_run.py 2019-06-27 13:17:07.791505800 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 - # Copyright 2015 the V8 project authors. All rights reserved. + # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. --- -2.17.0.windows.1 - +diff -Naur node-v11.15.0-orig/tools/gyp/gyp node-v11.15.0/tools/gyp/gyp +--- node-v11.15.0-orig/tools/gyp/gyp 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/gyp 2019-06-27 13:17:07.996506100 +0300 +@@ -5,4 +5,4 @@ + + set -e + base=$(dirname "$0") +-exec python "${base}/gyp_main.py" "$@" ++exec python2 "${base}/gyp_main.py" "$@" +diff -Naur node-v11.15.0-orig/tools/gyp/gyp.bat node-v11.15.0/tools/gyp/gyp.bat +--- node-v11.15.0-orig/tools/gyp/gyp.bat 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/gyp.bat 2019-06-27 13:17:08.026506100 +0300 +@@ -2,4 +2,4 @@ + @rem Use of this source code is governed by a BSD-style license that can be + @rem found in the LICENSE file. + +-@python "%~dp0gyp_main.py" %* ++@python2 "%~dp0gyp_main.py" %* +diff -Naur node-v11.15.0-orig/tools/gyp/gyp_main.py node-v11.15.0/tools/gyp/gyp_main.py +--- node-v11.15.0-orig/tools/gyp/gyp_main.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/gyp_main.py 2019-06-27 13:17:08.081506200 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/tools/gyp/gyptest.py node-v11.15.0/tools/gyp/gyptest.py +--- node-v11.15.0-orig/tools/gyp/gyptest.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/gyptest.py 2019-06-27 13:17:08.051506100 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/tools/gyp/pylib/gyp/__init__.py node-v11.15.0/tools/gyp/pylib/gyp/__init__.py +--- node-v11.15.0-orig/tools/gyp/pylib/gyp/__init__.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/pylib/gyp/__init__.py 2019-06-27 13:17:09.346507900 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/tools/gyp/pylib/gyp/common_test.py node-v11.15.0/tools/gyp/pylib/gyp/common_test.py +--- node-v11.15.0-orig/tools/gyp/pylib/gyp/common_test.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/pylib/gyp/common_test.py 2019-06-27 13:17:08.221506400 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/tools/gyp/pylib/gyp/easy_xml_test.py node-v11.15.0/tools/gyp/pylib/gyp/easy_xml_test.py +--- node-v11.15.0-orig/tools/gyp/pylib/gyp/easy_xml_test.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/pylib/gyp/easy_xml_test.py 2019-06-27 13:17:08.281506500 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/tools/gyp/pylib/gyp/flock_tool.py node-v11.15.0/tools/gyp/pylib/gyp/flock_tool.py +--- node-v11.15.0-orig/tools/gyp/pylib/gyp/flock_tool.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/pylib/gyp/flock_tool.py 2019-06-27 13:17:08.306506500 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/tools/gyp/pylib/gyp/generator/msvs_test.py node-v11.15.0/tools/gyp/pylib/gyp/generator/msvs_test.py +--- node-v11.15.0-orig/tools/gyp/pylib/gyp/generator/msvs_test.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/pylib/gyp/generator/msvs_test.py 2019-06-27 13:17:08.606506900 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/tools/gyp/pylib/gyp/generator/ninja.py node-v11.15.0/tools/gyp/pylib/gyp/generator/ninja.py +--- node-v11.15.0-orig/tools/gyp/pylib/gyp/generator/ninja.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/pylib/gyp/generator/ninja.py 2019-06-27 13:17:08.636507000 +0300 +@@ -1812,7 +1812,7 @@ + return '%(python)s gyp-win-tool link-with-manifests $arch %(embed)s ' \ + '%(out)s "%(ldcmd)s" %(resname)s $mt $rc "$intermediatemanifest" ' \ + '$manifests' % { +- 'python': sys.executable, ++ 'python2': sys.executable, + 'out': out, + 'ldcmd': ldcmd, + 'resname': resource_name, +diff -Naur node-v11.15.0-orig/tools/gyp/pylib/gyp/generator/ninja_test.py node-v11.15.0/tools/gyp/pylib/gyp/generator/ninja_test.py +--- node-v11.15.0-orig/tools/gyp/pylib/gyp/generator/ninja_test.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/pylib/gyp/generator/ninja_test.py 2019-06-27 13:17:08.661507000 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/tools/gyp/pylib/gyp/generator/xcode.py node-v11.15.0/tools/gyp/pylib/gyp/generator/xcode.py +--- node-v11.15.0-orig/tools/gyp/pylib/gyp/generator/xcode.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/pylib/gyp/generator/xcode.py 2019-06-27 13:17:08.691507000 +0300 +@@ -284,7 +284,7 @@ + command_prefix = '' + if serialize_all_tests: + command_prefix = \ +-"""python -c "import fcntl, subprocess, sys ++"""python2 -c "import fcntl, subprocess, sys + file = open('$TMPDIR/GYP_serialize_test_runs', 'a') + fcntl.flock(file.fileno(), fcntl.LOCK_EX) + sys.exit(subprocess.call(sys.argv[1:]))" """ +diff -Naur node-v11.15.0-orig/tools/gyp/pylib/gyp/generator/xcode_test.py node-v11.15.0/tools/gyp/pylib/gyp/generator/xcode_test.py +--- node-v11.15.0-orig/tools/gyp/pylib/gyp/generator/xcode_test.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/pylib/gyp/generator/xcode_test.py 2019-06-27 13:17:08.716507100 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2013 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/tools/gyp/pylib/gyp/input_test.py node-v11.15.0/tools/gyp/pylib/gyp/input_test.py +--- node-v11.15.0-orig/tools/gyp/pylib/gyp/input_test.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/pylib/gyp/input_test.py 2019-06-27 13:17:08.801507200 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright 2013 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/tools/gyp/pylib/gyp/mac_tool.py node-v11.15.0/tools/gyp/pylib/gyp/mac_tool.py +--- node-v11.15.0-orig/tools/gyp/pylib/gyp/mac_tool.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/pylib/gyp/mac_tool.py 2019-06-27 13:17:08.831507200 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/tools/gyp/pylib/gyp/MSVSSettings_test.py node-v11.15.0/tools/gyp/pylib/gyp/MSVSSettings_test.py +--- node-v11.15.0-orig/tools/gyp/pylib/gyp/MSVSSettings_test.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/pylib/gyp/MSVSSettings_test.py 2019-06-27 13:17:08.951507400 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/tools/gyp/pylib/gyp/win_tool.py node-v11.15.0/tools/gyp/pylib/gyp/win_tool.py +--- node-v11.15.0-orig/tools/gyp/pylib/gyp/win_tool.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/pylib/gyp/win_tool.py 2019-06-27 13:17:09.201507700 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +@@ -152,7 +152,7 @@ + # first and only link. We still tell link to generate a manifest, but we + # only use that to assert that our simpler process did not miss anything. + variables = { +- 'python': sys.executable, ++ 'python2': sys.executable, + 'arch': arch, + 'out': out, + 'ldcmd': ldcmd, +diff -Naur node-v11.15.0-orig/tools/gyp/samples/samples node-v11.15.0/tools/gyp/samples/samples +--- node-v11.15.0-orig/tools/gyp/samples/samples 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/samples/samples 2019-06-27 13:17:09.401508000 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/tools/gyp/samples/samples.bat node-v11.15.0/tools/gyp/samples/samples.bat +--- node-v11.15.0-orig/tools/gyp/samples/samples.bat 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/samples/samples.bat 2019-06-27 13:17:09.426508100 +0300 +@@ -2,4 +2,4 @@ + @rem Use of this source code is governed by a BSD-style license that can be + @rem found in the LICENSE file. + +-@python %~dp0/samples %* ++@python %~dp0/samples %* +diff -Naur node-v11.15.0-orig/tools/gyp/setup.py node-v11.15.0/tools/gyp/setup.py +--- node-v11.15.0-orig/tools/gyp/setup.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/setup.py 2019-06-27 13:17:09.456508100 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/tools/gyp/tools/emacs/testdata/media.gyp node-v11.15.0/tools/gyp/tools/emacs/testdata/media.gyp +--- node-v11.15.0-orig/tools/gyp/tools/emacs/testdata/media.gyp 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/tools/emacs/testdata/media.gyp 2019-06-27 13:17:09.606508300 +0300 +@@ -987,7 +987,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/media/jni/media_player_listener_jni.h', + ], + 'action': [ +- 'python', ++ 'python2', + '<(DEPTH)/base/android/jni_generator/jni_generator.py', + '-o', + '<@(_inputs)', +diff -Naur node-v11.15.0-orig/tools/gyp/tools/emacs/testdata/media.gyp.fontified node-v11.15.0/tools/gyp/tools/emacs/testdata/media.gyp.fontified +--- node-v11.15.0-orig/tools/gyp/tools/emacs/testdata/media.gyp.fontified 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/tools/emacs/testdata/media.gyp.fontified 2019-06-27 13:17:09.636508400 +0300 +@@ -988,7 +988,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/media/jni/media_player_listener_jni.h', + ], + 'action': [ +- 'python', ++ 'python2', + '<(DEPTH)/base/android/jni_generator/jni_generator.py', + '-o', + '<@(_inputs)', +diff -Naur node-v11.15.0-orig/tools/gyp/tools/graphviz.py node-v11.15.0/tools/gyp/tools/graphviz.py +--- node-v11.15.0-orig/tools/gyp/tools/graphviz.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/tools/graphviz.py 2019-06-27 13:17:09.666508400 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/tools/gyp/tools/pretty_gyp.py node-v11.15.0/tools/gyp/tools/pretty_gyp.py +--- node-v11.15.0-orig/tools/gyp/tools/pretty_gyp.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/tools/pretty_gyp.py 2019-06-27 13:17:09.696508400 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/tools/gyp/tools/pretty_sln.py node-v11.15.0/tools/gyp/tools/pretty_sln.py +--- node-v11.15.0-orig/tools/gyp/tools/pretty_sln.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/tools/pretty_sln.py 2019-06-27 13:17:09.721508500 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/tools/gyp/tools/pretty_vcproj.py node-v11.15.0/tools/gyp/tools/pretty_vcproj.py +--- node-v11.15.0-orig/tools/gyp/tools/pretty_vcproj.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp/tools/pretty_vcproj.py 2019-06-27 13:17:09.751508500 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur node-v11.15.0-orig/tools/gyp_node.py node-v11.15.0/tools/gyp_node.py +--- node-v11.15.0-orig/tools/gyp_node.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/gyp_node.py 2019-06-27 13:17:09.891508700 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + from __future__ import print_function + import os + import sys +diff -Naur node-v11.15.0-orig/tools/icu/icu-generic.gyp node-v11.15.0/tools/icu/icu-generic.gyp +--- node-v11.15.0-orig/tools/icu/icu-generic.gyp 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/icu/icu-generic.gyp 2019-06-27 13:17:09.946508800 +0300 +@@ -240,7 +240,7 @@ + 'msvs_quote_cmd': 0, + 'inputs': [ '<(icu_data_in)', 'icu_small.json' ], + 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icutmp/icudt<(icu_ver_major)<(icu_endianness).dat' ], +- 'action': [ 'python', ++ 'action': [ 'python2', + 'icutrim.py', + '-P', '<(PRODUCT_DIR)/.', # '.' suffix is a workaround against GYP assumptions :( + '-D', '<(icu_data_in)', +@@ -322,7 +322,7 @@ + 'action_name': 'icutrim', + 'inputs': [ '<(icu_data_in)', 'icu_small.json' ], + 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icutmp/icudt<(icu_ver_major)<(icu_endianness).dat' ], +- 'action': [ 'python', ++ 'action': [ 'python2', + 'icutrim.py', + '-P', '<(PRODUCT_DIR)', + '-D', '<(icu_data_in)', +diff -Naur node-v11.15.0-orig/tools/icu/icutrim.py node-v11.15.0/tools/icu/icutrim.py +--- node-v11.15.0-orig/tools/icu/icutrim.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/icu/icutrim.py 2019-06-27 13:17:10.031508900 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2014 IBM Corporation and Others. All Rights Reserved. + # +diff -Naur node-v11.15.0-orig/tools/icu/shrink-icu-src.py node-v11.15.0/tools/icu/shrink-icu-src.py +--- node-v11.15.0-orig/tools/icu/shrink-icu-src.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/icu/shrink-icu-src.py 2019-06-27 13:17:10.316509300 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + from __future__ import print_function + import optparse + import os +diff -Naur node-v11.15.0-orig/tools/inspector_protocol/check_protocol_compatibility.py node-v11.15.0/tools/inspector_protocol/check_protocol_compatibility.py +--- node-v11.15.0-orig/tools/inspector_protocol/check_protocol_compatibility.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/inspector_protocol/check_protocol_compatibility.py 2019-06-27 13:17:10.346509300 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright (c) 2011 Google Inc. All rights reserved. + # + # Redistribution and use in source and binary forms, with or without +diff -Naur node-v11.15.0-orig/tools/inspector_protocol/code_generator.py node-v11.15.0/tools/inspector_protocol/code_generator.py +--- node-v11.15.0-orig/tools/inspector_protocol/code_generator.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/inspector_protocol/code_generator.py 2019-06-27 13:17:10.376509400 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2016 The Chromium Authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/tools/inspector_protocol/concatenate_protocols.py node-v11.15.0/tools/inspector_protocol/concatenate_protocols.py +--- node-v11.15.0-orig/tools/inspector_protocol/concatenate_protocols.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/inspector_protocol/concatenate_protocols.py 2019-06-27 13:17:10.406509400 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2016 The Chromium Authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/tools/inspector_protocol/convert_protocol_to_json.py node-v11.15.0/tools/inspector_protocol/convert_protocol_to_json.py +--- node-v11.15.0-orig/tools/inspector_protocol/convert_protocol_to_json.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/inspector_protocol/convert_protocol_to_json.py 2019-06-27 13:17:10.431509500 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 The Chromium Authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur node-v11.15.0-orig/tools/install.py node-v11.15.0/tools/install.py +--- node-v11.15.0-orig/tools/install.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/install.py 2019-06-27 13:17:11.356510800 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + from __future__ import print_function + import ast +diff -Naur node-v11.15.0-orig/tools/js2c.py node-v11.15.0/tools/js2c.py +--- node-v11.15.0-orig/tools/js2c.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/js2c.py 2019-06-27 13:17:12.411512200 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2006-2008 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur node-v11.15.0-orig/tools/mkssldef.py node-v11.15.0/tools/mkssldef.py +--- node-v11.15.0-orig/tools/mkssldef.py 2019-04-30 20:31:53.000000000 +0300 ++++ node-v11.15.0/tools/mkssldef.py 2019-06-27 13:17:13.176513300 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + from __future__ import print_function + import re +diff -Naur node-v11.15.0-orig/tools/run-valgrind.py node-v11.15.0/tools/run-valgrind.py +--- node-v11.15.0-orig/tools/run-valgrind.py 2019-04-30 20:31:55.000000000 +0300 ++++ node-v11.15.0/tools/run-valgrind.py 2019-06-27 13:17:14.051514500 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2009 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur node-v11.15.0-orig/tools/specialize_node_d.py node-v11.15.0/tools/specialize_node_d.py +--- node-v11.15.0-orig/tools/specialize_node_d.py 2019-04-30 20:31:55.000000000 +0300 ++++ node-v11.15.0/tools/specialize_node_d.py 2019-06-27 13:17:14.136514700 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + # + # specialize_node_d.py output_file src/node.d flavor arch +diff -Naur node-v11.15.0-orig/tools/test.py node-v11.15.0/tools/test.py +--- node-v11.15.0-orig/tools/test.py 2019-04-30 20:31:55.000000000 +0300 ++++ node-v11.15.0/tools/test.py 2019-06-27 13:17:14.231514800 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2008 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without diff --git a/mingw-w64-nodejs/0002-Fix-system-icu-build.patch b/mingw-w64-nodejs/0002-Fix-system-icu-build.patch index e5bcde809d..a016e94a63 100644 --- a/mingw-w64-nodejs/0002-Fix-system-icu-build.patch +++ b/mingw-w64-nodejs/0002-Fix-system-icu-build.patch @@ -4,15 +4,15 @@ Date: Tue, 14 Feb 2017 21:43:31 -0500 Subject: [PATCH 02/23] Fix system-icu build --- - deps/v8/src/v8.gyp | 5 ----- + deps/v8/gypfiles/v8.gyp | 5 ----- 1 file changed, 5 deletions(-) -diff --git a/deps/v8/src/v8.gyp b/deps/v8/src/v8.gyp +diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp index e1d4aea0..05204ef2 100644 ---- a/deps/v8/src/v8.gyp -+++ b/deps/v8/src/v8.gyp -@@ -1818,11 +1818,6 @@ - 'runtime/runtime-intl.cc', +--- a/deps/v8/gypfiles/v8.gyp ++++ b/deps/v8/gypfiles/v8.gyp +@@ -1922,11 +1922,6 @@ + '../src/runtime/runtime-intl.cc', ], }], - ['OS=="win" and v8_enable_i18n_support==1', { @@ -21,8 +21,7 @@ index e1d4aea0..05204ef2 100644 - ], - }], ], - }, + }, # v8_base { -- 2.17.0.windows.1 - diff --git a/mingw-w64-nodejs/0005-Remove-.lib-suffix-on-linked-libraries.patch b/mingw-w64-nodejs/0005-Remove-.lib-suffix-on-linked-libraries.patch index 15c8e43731..295be7aba0 100644 --- a/mingw-w64-nodejs/0005-Remove-.lib-suffix-on-linked-libraries.patch +++ b/mingw-w64-nodejs/0005-Remove-.lib-suffix-on-linked-libraries.patch @@ -5,7 +5,7 @@ Subject: [PATCH 05/23] Remove .lib suffix on linked libraries --- deps/v8/BUILD.gn | 8 ++++---- - deps/v8/src/v8.gyp | 8 ++++---- + deps/v8/gypfiles/v8.gyp | 8 ++++---- node.gyp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) @@ -13,7 +13,7 @@ diff --git a/deps/v8/BUILD.gn b/deps/v8/BUILD.gn index 9d95036a..9a8c48db 100644 --- a/deps/v8/BUILD.gn +++ b/deps/v8/BUILD.gn -@@ -2537,10 +2537,10 @@ v8_component("v8_libbase") { +@@ -3127,10 +3127,10 @@ v8_component("v8_libbase") { defines += [ "_CRT_RAND_S" ] # for rand_s() libs = [ @@ -26,13 +26,13 @@ index 9d95036a..9a8c48db 100644 + "winmm", + "ws2_32", ] - } -diff --git a/deps/v8/src/v8.gyp b/deps/v8/src/v8.gyp + data_deps += [ "//build/win:runtime_libs" ] +diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp index 05204ef2..1baa7ab3 100644 ---- a/deps/v8/src/v8.gyp -+++ b/deps/v8/src/v8.gyp -@@ -2139,10 +2139,10 @@ +--- a/deps/v8/gypfiles/v8.gyp ++++ b/deps/v8/gypfiles/v8.gyp +@@ -2152,10 +2152,10 @@ 'msvs_disabled_warnings': [4351, 4355, 4800], 'link_settings': { 'libraries': [ @@ -51,15 +51,53 @@ diff --git a/node.gyp b/node.gyp index 38dcdac0..dba17e28 100644 --- a/node.gyp +++ b/node.gyp -@@ -348,7 +348,7 @@ - 'NODE_PLATFORM="win32"', - '_UNICODE=1', +@@ -339,9 +339,9 @@ + 'conditions': [ + ['OS=="win"', { + 'libraries': [ +- 'dbghelp.lib', +- 'PsApi.lib', +- 'Ws2_32.lib', ++ 'dbghelp', ++ 'psapi', ++ 'ws2_32', + ], + 'dll_files': [ + 'dbghelp.dll', +@@ -586,7 +586,7 @@ + ], + }], ], - 'libraries': [ '-lpsapi.lib' ] + 'libraries': [ '-lpsapi' ] - }, { # POSIX - 'defines': [ '__POSIX__' ], - 'sources': [ 'src/backtrace_posix.cc' ], + }], + [ 'node_use_etw=="true"', { + 'defines': [ 'HAVE_ETW=1' ], +@@ -682,9 +682,9 @@ + 'conditions': [ + ['OS=="win"', { + 'libraries': [ +- 'dbghelp.lib', +- 'PsApi.lib', +- 'Ws2_32.lib', ++ 'dbghelp', ++ 'psapi', ++ 'ws2_32', + ], + 'dll_files': [ + 'dbghelp.dll', +@@ -1047,9 +1047,9 @@ + 'conditions': [ + ['OS=="win"', { + 'libraries': [ +- 'dbghelp.lib', +- 'PsApi.lib', +- 'Ws2_32.lib', ++ 'dbghelp', ++ 'psapi', ++ 'ws2_32', + ], + 'dll_files': [ + 'dbghelp.dll', -- 2.17.0.windows.1 - diff --git a/mingw-w64-nodejs/0006-Define-_WIN32_WINNT-in-node.gyp.patch b/mingw-w64-nodejs/0006-Define-_WIN32_WINNT-in-node.gyp.patch index d4737ac151..1179af87c7 100644 --- a/mingw-w64-nodejs/0006-Define-_WIN32_WINNT-in-node.gyp.patch +++ b/mingw-w64-nodejs/0006-Define-_WIN32_WINNT-in-node.gyp.patch @@ -11,15 +11,13 @@ diff --git a/node.gypi b/node.gypi index 3990c59e..2705cefe 100644 --- a/node.gypi +++ b/node.gypi -@@ -1,5 +1,8 @@ - { - 'conditions': [ -+ [ 'OS=="win"', { +@@ -55,5 +55,6 @@ + 'defines!': [ + 'NODE_PLATFORM="win"', + ], + 'defines': [ '_WIN32_WINNT=0x0600' ], -+ }], - [ 'node_shared=="false"', { - 'msvs_settings': { - 'VCManifestTool': { + 'defines': [ + 'FD_SETSIZE=1024', + # we need to use node's preferred "win32" rather than gyp's preferred "win" -- 2.17.0.windows.1 - diff --git a/mingw-w64-nodejs/0007-Skip-sys-resource-and-unneeded-includes-in-node.cc.patch b/mingw-w64-nodejs/0007-Skip-sys-resource-and-unneeded-includes-in-node.cc.patch index 0238c565f6..16c227fd97 100644 --- a/mingw-w64-nodejs/0007-Skip-sys-resource-and-unneeded-includes-in-node.cc.patch +++ b/mingw-w64-nodejs/0007-Skip-sys-resource-and-unneeded-includes-in-node.cc.patch @@ -11,15 +11,15 @@ diff --git a/src/node.cc b/src/node.cc index d17752bb..0008d755 100644 --- a/src/node.cc +++ b/src/node.cc -@@ -102,7 +102,7 @@ +@@ -94,7 +94,7 @@ + #include + #endif + +-#if defined(_MSC_VER) ++#if defined(_WIN32) + #include #include - #define umask _umask - typedef int mode_t; --#else -+#elif !defined(__MINGW64_VERSION_MAJOR) - #include - #include // getrlimit, setrlimit - #include // setuid, getuid + #define STDIN_FILENO 0 -- 2.17.0.windows.1 diff --git a/mingw-w64-nodejs/0008-Link-with-municode-and-extern-wmain-for-Unicode.patch b/mingw-w64-nodejs/0008-Link-with-municode-and-extern-wmain-for-Unicode.patch index 13dc860c8d..c05812cb29 100644 --- a/mingw-w64-nodejs/0008-Link-with-municode-and-extern-wmain-for-Unicode.patch +++ b/mingw-w64-nodejs/0008-Link-with-municode-and-extern-wmain-for-Unicode.patch @@ -4,26 +4,25 @@ Date: Wed, 15 Feb 2017 19:11:53 -0500 Subject: [PATCH 08/23] Link with -municode and extern wmain for Unicode --- - node.gyp | 6 ++++-- + node.gyp | 5 +++-- + node.gypi | 1 + src/node_main.cc | 9 +++++++++ - 2 files changed, 13 insertions(+), 2 deletions(-) + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/node.gyp b/node.gyp index dba17e28..aa6e0588 100644 --- a/node.gyp +++ b/node.gyp -@@ -347,8 +347,9 @@ - # we need to use node's preferred "win32" rather than gyp's preferred "win" - 'NODE_PLATFORM="win32"', - '_UNICODE=1', -+ 'UNICODE', +@@ -586,7 +586,7 @@ + ], + }], ], - 'libraries': [ '-lpsapi' ] + 'libraries': [ '-municode', '-lpsapi' ] - }, { # POSIX - 'defines': [ '__POSIX__' ], - 'sources': [ 'src/backtrace_posix.cc' ], -@@ -808,7 +809,8 @@ + }], + [ 'node_use_etw=="true"', { + 'defines': [ 'HAVE_ETW=1' ], +@@ -993,7 +993,8 @@ '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h ], @@ -33,6 +32,18 @@ index dba17e28..aa6e0588 100644 'sources': [ 'test/cctest/node_module_reg.cc', +diff --git a/node.gypi b/node.gypi +index dba17e28..aa6e0588 100644 +--- a/node.gypi ++++ b/node.gypi +@@ -64,6 +64,7 @@ + # but we still inherit it from uv.h. + 'NOMINMAX', + '_UNICODE=1', ++ 'UNICODE', + ], + }, { # POSIX + 'defines': [ '__POSIX__' ], diff --git a/src/node_main.cc b/src/node_main.cc index 2a511b92..d592a1f8 100644 --- a/src/node_main.cc @@ -45,7 +56,7 @@ index 2a511b92..d592a1f8 100644 +#extern "C" { +#endif + - int wmain(int argc, wchar_t *wargv[]) { + int wmain(int argc, wchar_t* wargv[]) { if (!IsWindows7OrGreater()) { fprintf(stderr, "This application is only supported on Windows 7, " @@ -71,6 +75,11 @@ int wmain(int argc, wchar_t *wargv[]) { @@ -62,4 +73,3 @@ index 2a511b92..d592a1f8 100644 #ifdef __linux__ -- 2.17.0.windows.1 - diff --git a/mingw-w64-nodejs/0009-Remove-no_rand_screen-from-s_client-invocation.patch b/mingw-w64-nodejs/0009-Remove-no_rand_screen-from-s_client-invocation.patch deleted file mode 100644 index 1ff07486b5..0000000000 --- a/mingw-w64-nodejs/0009-Remove-no_rand_screen-from-s_client-invocation.patch +++ /dev/null @@ -1,171 +0,0 @@ -From a277001292d39b8519227470e43357f9c580f583 Mon Sep 17 00:00:00 2001 -From: Alethea Rose -Date: Wed, 15 Feb 2017 21:34:13 -0500 -Subject: [PATCH 09/23] Remove -no_rand_screen from s_client invocation - ---- - test/parallel/test-https-foafssl.js | 4 ---- - test/parallel/test-tls-alert.js | 4 ---- - test/parallel/test-tls-dhe.js | 4 ---- - test/parallel/test-tls-ecdh-disable.js | 4 ---- - test/parallel/test-tls-ecdh.js | 4 ---- - test/parallel/test-tls-no-sslv3.js | 4 ---- - test/parallel/test-tls-securepair-server.js | 4 ---- - test/parallel/test-tls-server-verify.js | 4 ---- - test/parallel/test-tls-session-cache.js | 4 ---- - test/parallel/test-tls-set-ciphers.js | 4 ---- - 10 files changed, 40 deletions(-) - -diff --git a/test/parallel/test-https-foafssl.js b/test/parallel/test-https-foafssl.js -index 2a22bda6..4e1a8fbc 100644 ---- a/test/parallel/test-https-foafssl.js -+++ b/test/parallel/test-https-foafssl.js -@@ -72,10 +72,6 @@ server.listen(0, function() { - '-cert', fixtures.path('foafssl.crt'), - '-key', fixtures.path('foafssl.key')]; - -- // for the performance and stability issue in s_client on Windows -- if (common.isWindows) -- args.push('-no_rand_screen'); -- - const client = spawn(common.opensslCli, args); - - client.stdout.on('data', function(data) { -diff --git a/test/parallel/test-tls-alert.js b/test/parallel/test-tls-alert.js -index 8e78e748..5847f9ce 100644 ---- a/test/parallel/test-tls-alert.js -+++ b/test/parallel/test-tls-alert.js -@@ -46,10 +46,6 @@ const server = tls.Server({ - const args = ['s_client', '-quiet', '-tls1_1', - '-connect', `127.0.0.1:${this.address().port}`]; - -- // for the performance and stability issue in s_client on Windows -- if (common.isWindows) -- args.push('-no_rand_screen'); -- - const client = spawn(common.opensslCli, args); - let out = ''; - client.stderr.setEncoding('utf8'); -diff --git a/test/parallel/test-tls-dhe.js b/test/parallel/test-tls-dhe.js -index 177f6f2e..86868633 100644 ---- a/test/parallel/test-tls-dhe.js -+++ b/test/parallel/test-tls-dhe.js -@@ -71,10 +71,6 @@ function test(keylen, expectedCipher, cb) { - const args = ['s_client', '-connect', `127.0.0.1:${this.address().port}`, - '-cipher', ciphers]; - -- // for the performance and stability issue in s_client on Windows -- if (common.isWindows) -- args.push('-no_rand_screen'); -- - const client = spawn(common.opensslCli, args); - let out = ''; - client.stdout.setEncoding('utf8'); -diff --git a/test/parallel/test-tls-ecdh-disable.js b/test/parallel/test-tls-ecdh-disable.js -index 72b51771..ef761147 100644 ---- a/test/parallel/test-tls-ecdh-disable.js -+++ b/test/parallel/test-tls-ecdh-disable.js -@@ -48,10 +48,6 @@ server.listen(0, '127.0.0.1', common.mustCall(function() { - let cmd = `"${common.opensslCli}" s_client -cipher ${ - options.ciphers} -connect 127.0.0.1:${this.address().port}`; - -- // for the performance and stability issue in s_client on Windows -- if (common.isWindows) -- cmd += ' -no_rand_screen'; -- - exec(cmd, common.mustCall(function(err, stdout, stderr) { - // Old versions of openssl will still exit with 0 so we - // can't just check if err is not null. -diff --git a/test/parallel/test-tls-ecdh.js b/test/parallel/test-tls-ecdh.js -index 170031b2..9cd58006 100644 ---- a/test/parallel/test-tls-ecdh.js -+++ b/test/parallel/test-tls-ecdh.js -@@ -51,10 +51,6 @@ server.listen(0, '127.0.0.1', common.mustCall(function() { - let cmd = `"${common.opensslCli}" s_client -cipher ${ - options.ciphers} -connect 127.0.0.1:${this.address().port}`; - -- // for the performance and stability issue in s_client on Windows -- if (common.isWindows) -- cmd += ' -no_rand_screen'; -- - exec(cmd, common.mustCall(function(err, stdout, stderr) { - assert.ifError(err); - assert(stdout.includes(reply)); -diff --git a/test/parallel/test-tls-no-sslv3.js b/test/parallel/test-tls-no-sslv3.js -index 92f85128..4cbb62e3 100644 ---- a/test/parallel/test-tls-no-sslv3.js -+++ b/test/parallel/test-tls-no-sslv3.js -@@ -23,10 +23,6 @@ server.listen(0, '127.0.0.1', function() { - '-ssl3', - '-connect', address]; - -- // for the performance and stability issue in s_client on Windows -- if (common.isWindows) -- args.push('-no_rand_screen'); -- - const client = spawn(common.opensslCli, args, { stdio: 'pipe' }); - client.stdout.pipe(process.stdout); - client.stderr.pipe(process.stderr); -diff --git a/test/parallel/test-tls-securepair-server.js b/test/parallel/test-tls-securepair-server.js -index 056eebda..994e037c 100644 ---- a/test/parallel/test-tls-securepair-server.js -+++ b/test/parallel/test-tls-securepair-server.js -@@ -113,10 +113,6 @@ server.listen(0, common.mustCall(function() { - - const args = ['s_client', '-connect', `127.0.0.1:${this.address().port}`]; - -- // for the performance and stability issue in s_client on Windows -- if (common.isWindows) -- args.push('-no_rand_screen'); -- - const client = spawn(common.opensslCli, args); - - -diff --git a/test/parallel/test-tls-server-verify.js b/test/parallel/test-tls-server-verify.js -index 92c4752a..f2edfd36 100644 ---- a/test/parallel/test-tls-server-verify.js -+++ b/test/parallel/test-tls-server-verify.js -@@ -149,10 +149,6 @@ function runClient(prefix, port, options, cb) { - - const args = ['s_client', '-connect', `127.0.0.1:${port}`]; - -- // for the performance issue in s_client on Windows -- if (common.isWindows) -- args.push('-no_rand_screen'); -- - console.log(`${prefix} connecting with`, options.name); - - switch (options.name) { -diff --git a/test/parallel/test-tls-session-cache.js b/test/parallel/test-tls-session-cache.js -index 2bbf3b64..6bd57bb2 100644 ---- a/test/parallel/test-tls-session-cache.js -+++ b/test/parallel/test-tls-session-cache.js -@@ -105,10 +105,6 @@ function doTest(testOptions, callback) { - '-reconnect' - ].concat(testOptions.tickets ? [] : '-no_ticket'); - -- // for the performance and stability issue in s_client on Windows -- if (common.isWindows) -- args.push('-no_rand_screen'); -- - function spawnClient() { - const client = spawn(common.opensslCli, args, { - stdio: [ 0, 1, 'pipe' ] -diff --git a/test/parallel/test-tls-set-ciphers.js b/test/parallel/test-tls-set-ciphers.js -index abb5f219..04bfb832 100644 ---- a/test/parallel/test-tls-set-ciphers.js -+++ b/test/parallel/test-tls-set-ciphers.js -@@ -54,10 +54,6 @@ server.listen(0, '127.0.0.1', function() { - let cmd = `"${common.opensslCli}" s_client -cipher ${ - options.ciphers} -connect 127.0.0.1:${this.address().port}`; - -- // for the performance and stability issue in s_client on Windows -- if (common.isWindows) -- cmd += ' -no_rand_screen'; -- - exec(cmd, function(err, stdout, stderr) { - assert.ifError(err); - response = stdout; --- -2.17.0.windows.1 - diff --git a/mingw-w64-nodejs/0010-Fix-incorrect-test-assumptions-for-MinGW.patch b/mingw-w64-nodejs/0010-Fix-incorrect-test-assumptions-for-MinGW.patch index 33eda740ef..180a53e799 100644 --- a/mingw-w64-nodejs/0010-Fix-incorrect-test-assumptions-for-MinGW.patch +++ b/mingw-w64-nodejs/0010-Fix-incorrect-test-assumptions-for-MinGW.patch @@ -5,7 +5,6 @@ Subject: [PATCH 10/23] Fix incorrect test assumptions for MinGW --- test/parallel/test-debugger-pid.js | 3 ++- - test/parallel/test-fs-symlink.js | 5 ++++- test/parallel/test-https-foafssl.js | 6 +++++- test/parallel/test-npm-install.js | 5 +++++ 4 files changed, 16 insertions(+), 3 deletions(-) @@ -25,22 +24,6 @@ index e11d2315..857e6be7 100644 buffer = data.pop(); data.forEach(function(line) { interfacer.emit('line', line); -diff --git a/test/parallel/test-fs-symlink.js b/test/parallel/test-fs-symlink.js -index 1de75320..26577365 100644 ---- a/test/parallel/test-fs-symlink.js -+++ b/test/parallel/test-fs-symlink.js -@@ -32,7 +32,10 @@ const fs = require('fs'); - let linkTime; - let fileTime; - --common.refreshTmpDir(); -+if (common.isMinGW) { -+ common.skip('MinGW does not support symlinks'); -+ return; -+} - - // test creating and reading symbolic link - const linkData = fixtures.path('/cycles/root.js'); diff --git a/test/parallel/test-https-foafssl.js b/test/parallel/test-https-foafssl.js index 4e1a8fbc..6cf6deca 100644 --- a/test/parallel/test-https-foafssl.js @@ -71,9 +54,8 @@ index d826eb09..be4084f2 100644 + return; +} + - common.refreshTmpDir(); - const npmSandbox = path.join(common.tmpDir, 'npm-sandbox'); - fs.mkdirSync(npmSandbox); + const tmpdir = require('../common/tmpdir'); + tmpdir.refresh(); + const npmSandbox = path.join(tmpdir.path, 'npm-sandbox'); -- 2.17.0.windows.1 - diff --git a/mingw-w64-nodejs/0011-detect-architecture.patch b/mingw-w64-nodejs/0011-detect-architecture.patch index fd69d2af61..2d8563422d 100644 --- a/mingw-w64-nodejs/0011-detect-architecture.patch +++ b/mingw-w64-nodejs/0011-detect-architecture.patch @@ -4,15 +4,15 @@ Date: Thu, 12 Apr 2018 10:18:48 +0200 Subject: [PATCH 11/23] detect architecture --- - configure | 2 +- + configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure b/configure +diff --git a/configure.py b/configure.py index 5a242a1a..9950626e 100755 ---- a/configure -+++ b/configure -@@ -855,7 +855,7 @@ def configure_node(o): - o['variables']['node_install_npm'] = b(not options.without_npm) +--- a/configure.py ++++ b/configure.py +@@ -955,7 +955,7 @@ def configure_node(o): + o['variables']['node_report'] = b(not options.without_report) o['default_configuration'] = 'Debug' if options.debug else 'Release' - host_arch = host_arch_win() if os.name == 'nt' else host_arch_cc() @@ -22,4 +22,3 @@ index 5a242a1a..9950626e 100755 # the Makefile resets this to x86 afterward -- 2.17.0.windows.1 - diff --git a/mingw-w64-nodejs/0013-Revert-to-FHS-installation-paths-on-Windows-tests-no.patch b/mingw-w64-nodejs/0013-Revert-to-FHS-installation-paths-on-Windows-tests-no.patch index 9261f2496d..e6654574fd 100644 --- a/mingw-w64-nodejs/0013-Revert-to-FHS-installation-paths-on-Windows-tests-no.patch +++ b/mingw-w64-nodejs/0013-Revert-to-FHS-installation-paths-on-Windows-tests-no.patch @@ -58,7 +58,7 @@ index c049f213..d1654b7c 100644 else home = path.resolve(temp, 'npm-' + uidOrPid) -var cacheExtra = process.platform === 'win32' ? 'npm-cache' : '.npm' --var cacheRoot = process.platform === 'win32' && process.env.APPDATA || home +-var cacheRoot = (process.platform === 'win32' && process.env.APPDATA) || home +var cacheExtra = '.npm' +var cacheRoot = home var cache = path.resolve(cacheRoot, cacheExtra) @@ -78,7 +78,7 @@ diff --git a/deps/npm/lib/npm.js b/deps/npm/lib/npm.js index e5871260..ad9ed251 100644 --- a/deps/npm/lib/npm.js +++ b/deps/npm/lib/npm.js -@@ -393,7 +393,7 @@ +@@ -387,7 +387,7 @@ { get: function () { var b = npm.globalPrefix @@ -87,13 +87,13 @@ index e5871260..ad9ed251 100644 return b } }) -@@ -410,9 +410,7 @@ +@@ -404,9 +404,7 @@ Object.defineProperty(npm, 'globalDir', { get: function () { - return (process.platform !== 'win32') -- ? path.resolve(npm.globalPrefix, 'lib', 'node_modules') -- : path.resolve(npm.globalPrefix, 'node_modules') +- ? path.resolve(npm.globalPrefix, 'lib', 'node_modules') +- : path.resolve(npm.globalPrefix, 'node_modules') + return path.resolve(npm.globalPrefix, 'lib', 'node_modules') }, enumerable: true @@ -114,15 +114,14 @@ diff --git a/deps/npm/node_modules/bin-links/index.js b/deps/npm/node_modules/bi index e6370aca..759daee6 100644 --- a/deps/npm/node_modules/bin-links/index.js +++ b/deps/npm/node_modules/bin-links/index.js -@@ -149,7 +149,7 @@ function linkBin (from, to, opts, cb) { +@@ -115,7 +115,7 @@ function linkBin (from, to, opts, cb) { } - function linkMans (pkg, folder, parent, gtop, opts, cb) { -- if (!pkg.man || !gtop || process.platform === 'win32') return cb() -+ if (!pkg.man || !gtop) return cb() + function linkMans (pkg, folder, parent, gtop, opts) { +- if (!pkg.man || !gtop || process.platform === 'win32') return ++ if (!pkg.man || !gtop) return var manRoot = path.resolve(opts.prefix, 'share', 'man') opts.log.verbose('linkMans', 'man files are', pkg.man, 'in', manRoot) -- 2.17.0.windows.1 - diff --git a/mingw-w64-nodejs/0014-Fix-linking-of-cctest-in-mingw-w64.patch b/mingw-w64-nodejs/0014-Fix-linking-of-cctest-in-mingw-w64.patch deleted file mode 100644 index bfc6162d9f..0000000000 --- a/mingw-w64-nodejs/0014-Fix-linking-of-cctest-in-mingw-w64.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a0b8c2ab3e6cb4d9a45690e7209b9656437c7a79 Mon Sep 17 00:00:00 2001 -From: Johannes Schindelin -Date: Fri, 13 Apr 2018 23:29:07 +0200 -Subject: [PATCH 14/23] Fix linking of `cctest` in mingw-w64 - -We do not have .obj files. Really. Also, it seems that we somehow got -the wrong path for the object files of the node target, let's fix them -at the same time. - -Signed-off-by: Johannes Schindelin ---- - node.gyp | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/node.gyp b/node.gyp -index aa6e0588..39d47a24 100644 ---- a/node.gyp -+++ b/node.gyp -@@ -771,9 +771,6 @@ - 'OBJ_SUFFIX': 'o', - 'OBJ_SEPARATOR': '/', - 'conditions': [ -- ['OS=="win"', { -- 'OBJ_SUFFIX': 'obj', -- }], - ['GENERATOR=="ninja"', { - 'OBJ_PATH': '<(OBJ_DIR)/src', - 'OBJ_GEN_PATH': '<(OBJ_DIR)/gen', -@@ -782,9 +779,9 @@ - }, { - 'conditions': [ - ['OS=="win"', { -- 'OBJ_PATH': '<(OBJ_DIR)/node', -- 'OBJ_GEN_PATH': '<(OBJ_DIR)/node', -- 'OBJ_TRACING_PATH': '<(OBJ_DIR)/node', -+ 'OBJ_PATH': '<(OBJ_DIR).target/node/src', -+ 'OBJ_GEN_PATH': '<(OBJ_DIR).target/node/gen', -+ 'OBJ_TRACING_PATH': '<(OBJ_DIR).target/node/src/tracing', - }], - ['OS=="aix"', { - 'OBJ_PATH': '<(OBJ_DIR)/node_base/src', --- -2.17.0.windows.1 - diff --git a/mingw-w64-nodejs/0019-Do-not-let-nghttp2-pretend-that-ssize_t-is-int.patch b/mingw-w64-nodejs/0019-Do-not-let-nghttp2-pretend-that-ssize_t-is-int.patch deleted file mode 100644 index 81562c1daf..0000000000 --- a/mingw-w64-nodejs/0019-Do-not-let-nghttp2-pretend-that-ssize_t-is-int.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ebf35f227fac73e4f8a6f0632985314d3ff19050 Mon Sep 17 00:00:00 2001 -From: Johannes Schindelin -Date: Sat, 14 Apr 2018 15:35:35 +0200 -Subject: [PATCH 19/23] Do not let nghttp2 pretend that ssize_t is int - -It is not... At least not on 64-bit systems. - -Signed-off-by: Johannes Schindelin ---- - deps/nghttp2/lib/includes/config.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/deps/nghttp2/lib/includes/config.h b/deps/nghttp2/lib/includes/config.h -index 0346e061..ae10943a 100644 ---- a/deps/nghttp2/lib/includes/config.h -+++ b/deps/nghttp2/lib/includes/config.h -@@ -2,7 +2,7 @@ - #define NGHTTP2_NORETURN - - /* Define to `int' if does not define. */ --#define ssize_t int -+/* #define ssize_t int */ - - /* Define to 1 if you have the `std::map::emplace`. */ - #define HAVE_STD_MAP_EMPLACE 1 --- -2.17.0.windows.1 - diff --git a/mingw-w64-nodejs/0021-Use-wide-character-Win32-API-functions-to-handle-wch.patch b/mingw-w64-nodejs/0021-Use-wide-character-Win32-API-functions-to-handle-wch.patch index ee62439967..a0c8913553 100644 --- a/mingw-w64-nodejs/0021-Use-wide-character-Win32-API-functions-to-handle-wch.patch +++ b/mingw-w64-nodejs/0021-Use-wide-character-Win32-API-functions-to-handle-wch.patch @@ -13,12 +13,12 @@ diff --git a/deps/v8/src/base/debug/stack_trace_win.cc b/deps/v8/src/base/debug/ index 64e63091..8110ef29 100644 --- a/deps/v8/src/base/debug/stack_trace_win.cc +++ b/deps/v8/src/base/debug/stack_trace_win.cc -@@ -43,9 +43,9 @@ long WINAPI StackDumpExceptionFilter(EXCEPTION_POINTERS* info) { // NOLINT +@@ -50,9 +50,9 @@ long WINAPI StackDumpExceptionFilter(EXCEPTION_POINTERS* info) { // NOLINT } void GetExePath(wchar_t* path_out) { -- GetModuleFileName(NULL, path_out, MAX_PATH); -+ GetModuleFileNameW(NULL, path_out, MAX_PATH); +- GetModuleFileName(nullptr, path_out, MAX_PATH); ++ GetModuleFileNameW(nullptr, path_out, MAX_PATH); path_out[MAX_PATH - 1] = L'\0'; - PathRemoveFileSpec(path_out); + PathRemoveFileSpecW(path_out); @@ -27,4 +27,3 @@ index 64e63091..8110ef29 100644 bool InitializeSymbols() { -- 2.17.0.windows.1 - diff --git a/mingw-w64-nodejs/PKGBUILD b/mingw-w64-nodejs/PKGBUILD index c54e720f60..17edf74574 100644 --- a/mingw-w64-nodejs/PKGBUILD +++ b/mingw-w64-nodejs/PKGBUILD @@ -7,8 +7,8 @@ _realname=nodejs pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=8.11.1 -pkgrel=6 +pkgver=11.15.0 +pkgrel=1 pkgdesc="Evented I/O for V8 javascript (mingw-w64)" arch=('any') url="https://nodejs.org/" @@ -17,6 +17,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2" 'make') depends=("${MINGW_PACKAGE_PREFIX}-c-ares" "${MINGW_PACKAGE_PREFIX}-http-parser" "${MINGW_PACKAGE_PREFIX}-icu" + "${MINGW_PACKAGE_PREFIX}-nghttp2" "${MINGW_PACKAGE_PREFIX}-libuv" "${MINGW_PACKAGE_PREFIX}-openssl" "${MINGW_PACKAGE_PREFIX}-zlib" @@ -33,17 +34,14 @@ source=("https://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.xz" '0006-Define-_WIN32_WINNT-in-node.gyp.patch' '0007-Skip-sys-resource-and-unneeded-includes-in-node.cc.patch' '0008-Link-with-municode-and-extern-wmain-for-Unicode.patch' - '0009-Remove-no_rand_screen-from-s_client-invocation.patch' '0010-Fix-incorrect-test-assumptions-for-MinGW.patch' '0011-detect-architecture.patch' '0012-Use-shell-wrapper-script-for-npm-on-MSYS2-MinGW-w64.patch' '0013-Revert-to-FHS-installation-paths-on-Windows-tests-no.patch' - '0014-Fix-linking-of-cctest-in-mingw-w64.patch' '0015-cctest-allow-building-with-municode.patch' '0016-format-macros.h-do-not-rely-on-__STDC_FORMAT_MACROS.patch' '0017-Do-not-get-confused-by-the-presence-of-winpthread.patch' '0018-Add-missing-include-to-build-condition-variable.cc-s.patch' - '0019-Do-not-let-nghttp2-pretend-that-ssize_t-is-int.patch' '0020-inspector-use-namespaced-icu-symbols.patch' '0021-Use-wide-character-Win32-API-functions-to-handle-wch.patch' '0022-Disable-MSVC_HACK.patch' @@ -61,17 +59,14 @@ prepare() { patch -Np1 -i "${srcdir}/0006-Define-_WIN32_WINNT-in-node.gyp.patch" patch -Np1 -i "${srcdir}/0007-Skip-sys-resource-and-unneeded-includes-in-node.cc.patch" patch -Np1 -i "${srcdir}/0008-Link-with-municode-and-extern-wmain-for-Unicode.patch" - patch -Np1 -i "${srcdir}/0009-Remove-no_rand_screen-from-s_client-invocation.patch" patch -Np1 -i "${srcdir}/0010-Fix-incorrect-test-assumptions-for-MinGW.patch" patch -Np1 -i "${srcdir}/0011-detect-architecture.patch" patch -Np1 -i "${srcdir}/0012-Use-shell-wrapper-script-for-npm-on-MSYS2-MinGW-w64.patch" patch -Np1 -i "${srcdir}/0013-Revert-to-FHS-installation-paths-on-Windows-tests-no.patch" - patch -Np1 -i "${srcdir}/0014-Fix-linking-of-cctest-in-mingw-w64.patch" patch -Np1 -i "${srcdir}/0015-cctest-allow-building-with-municode.patch" patch -Np1 -i "${srcdir}/0016-format-macros.h-do-not-rely-on-__STDC_FORMAT_MACROS.patch" patch -Np1 -i "${srcdir}/0017-Do-not-get-confused-by-the-presence-of-winpthread.patch" patch -Np1 -i "${srcdir}/0018-Add-missing-include-to-build-condition-variable.cc-s.patch" - patch -Np1 -i "${srcdir}/0019-Do-not-let-nghttp2-pretend-that-ssize_t-is-int.patch" patch -Np1 -i "${srcdir}/0020-inspector-use-namespaced-icu-symbols.patch" patch -Np1 -i "${srcdir}/0021-Use-wide-character-Win32-API-functions-to-handle-wch.patch" patch -Np1 -i "${srcdir}/0022-Disable-MSVC_HACK.patch" @@ -105,9 +100,9 @@ build() { --shared-openssl \ --shared-zlib \ --shared-cares \ - --with-intl=system-icu \ + --shared-nghttp2 \ --shared-http-parser \ - --without-perfctr \ + --with-intl=system-icu \ --without-etw \ "${extra_config[@]}" @@ -154,28 +149,25 @@ package() { install -m755 "${srcdir}/${CARCH}/deps/npm/bin/npm.cmd" "${pkgdir}${MINGW_PREFIX}/bin/npm.cmd" } -sha256sums=('40a6eb51ea37fafcf0cfb58786b15b99152bec672cccf861c14d1cca0ad4758a' - '50ae0cebb123b4617fb79961ae6f95fb2bb0da17d0dcf5daa89f54f3b8c8261d' - 'fb3aaa1d81b0330d6771c0127aea12f19dcdef8ff21bc7c6037e87f320228ce0' +sha256sums=('68a776c5d8b8b91a8f2adac2ca4ce4390ae1804883ec7ec9c0d6a6a64d306a76' + '0e3b9ec420393c6d56fb5dcabb60acc7a1f50000ebea3a8bbbf6ecb87a00e404' + 'b5357ea485814c179b3b1131f985abf4e3992791d7008d7f9c60dde3cd800401' '7a0f96ba5b8639807a22c592d25e87bceae623d382c41bfc7f994367aa9b8ffb' '8c21a199822d3e106eacbc8e4ef923508293026edc8c55ad838c316cea5bda45' - '891eaf02a89b3e632d71f8331a80ae26f3abb78b6e0c14e811ae6f3148459bdc' - 'ca3d3829d5e7f2778854f1a14ab0c46e18398a979805093b419e66cc01b3d940' - 'd4165599af3ac6008bd1d99c51c35ca13c848a2631da937e4c45e63a0d3c598f' - 'a70ee9d8122c5a4178028fe9c337746f2cbe1427ce24e502a1c1301e57401815' - 'a383724fd58925bda9fd9a149da79b8afdde4fd55a1298c7cdda297a2d3f5bab' - '7966b11c2e413f74d00d5078ca065e3f14957750ae7741a0520f17f203097a2b' - '0bf9e2d240b5d53435e278066e8cb0bd695b8fd4e6cce4b48a67bfa22f1b68c9' + 'a8640f1b7b90469ecc5314dd710ee18ae33ef18133263fdb497ff302dd38bc41' + '024f46581402936d1ef118e3db9249366157eeea3c1db60ad605eaa465a45476' + 'f15e5266eece74443bedfa9d6d1243083ef30b27cdf621cb4b4267866660387c' + '6e1535166dc3fc75540f0e5e3fc25253cf488cb40a98a4b23f7b24e0059ca9f5' + '59b052ff5e50f4ab49619bad1d8c388f8a5183256361452e262ffa9e079c99b6' + '495b44761dde93a242850304038bd47fdc665d4bbc59e4b027c192afebc9283a' 'b37fba2c8bb254905993b41d0ed319fa02bc37c88446ef0b2341ee92cc42faae' - '89fde4ba2d92f007f3f27896f9253f6a3b7668595b7f68cae2756e6256a861ac' - 'd84636872a1f8d3692cf8748c8d9fb21d0314b23a0ec89b30065ddbd058176bb' + '9a29cb99c53dc39187d2cbb7e559130944063e07342802b9d77cfb037c8d9b30' '2005eb72281e1c727411015ced471b37999ccd062d60856cabd68032ed303601' '4fd604e2889e1741f8a7ed5b3e945d401eed2b13086daa4544384da4c04698d1' '3e5da564180238aeaf6e79b3273838465bed962fc65bbe8f0657e09ab0cabee3' '3a83695ebb617341b687133cd5319e0762c2f8af880800ac36de232311ccb903' - '2d91635773140d50b2e2065898b89550fecf76ca984954e8bc53dc2ef2650714' 'f7144d6fe1efee3d9134d92d3757c9bcc3f570dbca5a4fbadf3efd6492ba345f' - 'b68ecff38ab7e1a22274a48f0487cebe2769e9222d75da96f8eab2732d79efb9' + '71e6b87542013c68641bcc8f98a769236f7181125960b2dcd1e7af516b1447ac' '44a8d757584cb725760c9d9bd661fb23ee0a2b555ffca8a449573e4d03db7dcc' '8cc3ef3ce149e5f0869d434538a9bd0a934afc52f0f571f6436694ce11587d12' '284251ff443506cd61530a026afb421d0084e4ad25c037bcfe3a045246d729a2')