diff options
author | Ulrich Ölmann <u.oelmann@pengutronix.de> | 2020-03-27 09:39:21 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-03-27 13:08:32 +0100 |
commit | 866fae6c76146762cf3e9a233f8a16ac08d7d28d (patch) | |
tree | 4e96223fcbd4ce35e0a4d2609b4e68bddb92f3c0 /patches | |
parent | 403cd8884939d430aecbecbf8db3d567a209ff64 (diff) | |
download | ptxdist-866fae6c76146762cf3e9a233f8a16ac08d7d28d.tar.gz ptxdist-866fae6c76146762cf3e9a233f8a16ac08d7d28d.tar.xz |
nodejs: version bump 12.14.1 LTS -> 12.16.1 LTS
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
Message-Id: <20200327083921.30860-1-u.oelmann@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/node-v12.16.1/0001-Disable-running-gyp-on-shared-deps.patch (renamed from patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch) | 2 | ||||
-rw-r--r-- | patches/node-v12.16.1/0002-Install-both-binaries-and-use-libdir.patch (renamed from patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch) | 12 | ||||
-rw-r--r-- | patches/node-v12.16.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch (renamed from patches/node-v12.14.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch) | 0 | ||||
-rw-r--r-- | patches/node-v12.16.1/series (renamed from patches/node-v12.14.1/series) | 0 |
4 files changed, 7 insertions, 7 deletions
diff --git a/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch b/patches/node-v12.16.1/0001-Disable-running-gyp-on-shared-deps.patch index b41095a20..f1d6bb737 100644 --- a/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch +++ b/patches/node-v12.16.1/0001-Disable-running-gyp-on-shared-deps.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Disable running gyp on shared deps 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 56f53582d1f4..f289f258df6f 100644 +index 05eaa73abbe0..965e4f8560e6 100644 --- a/Makefile +++ b/Makefile @@ -141,7 +141,7 @@ test-code-cache: with-code-cache diff --git a/patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch b/patches/node-v12.16.1/0002-Install-both-binaries-and-use-libdir.patch index 38c3c9650..b9dc62bb4 100644 --- a/patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch +++ b/patches/node-v12.16.1/0002-Install-both-binaries-and-use-libdir.patch @@ -12,10 +12,10 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com> 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/configure.py b/configure.py -index 20cce214dbb1..e2d78a2a51ef 100755 +index 14f5665e0299..36a8a413713a 100755 --- a/configure.py +++ b/configure.py -@@ -559,6 +559,12 @@ parser.add_option('--shared', +@@ -572,6 +572,12 @@ parser.add_option('--shared', help='compile shared library for embedding node in another project. ' + '(This mode is not officially supported for regular applications)') @@ -28,14 +28,14 @@ index 20cce214dbb1..e2d78a2a51ef 100755 parser.add_option('--without-v8-platform', action='store_true', dest='without_v8_platform', -@@ -1103,6 +1109,7 @@ def configure_node(o): - if o['variables']['want_separate_host_toolset'] == 0: - o['variables']['node_code_cache'] = 'yes' # For testing +@@ -1121,6 +1127,7 @@ def configure_node(o): + o['variables']['node_no_browser_globals'] = b(options.no_browser_globals) + o['variables']['node_shared'] = b(options.shared) + o['variables']['libdir'] = options.libdir node_module_version = getmoduleversion.get_version() - if sys.platform == 'darwin': + if options.dest_os == 'android': diff --git a/tools/install.py b/tools/install.py index 655802980a6e..fe4723bf1501 100755 --- a/tools/install.py diff --git a/patches/node-v12.14.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch b/patches/node-v12.16.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch index f05bcafd5..f05bcafd5 100644 --- a/patches/node-v12.14.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch +++ b/patches/node-v12.16.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch diff --git a/patches/node-v12.14.1/series b/patches/node-v12.16.1/series index f86c12166..f86c12166 100644 --- a/patches/node-v12.14.1/series +++ b/patches/node-v12.16.1/series |