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/node-v12.16.1 | |
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/node-v12.16.1')
4 files changed, 140 insertions, 0 deletions
diff --git a/patches/node-v12.16.1/0001-Disable-running-gyp-on-shared-deps.patch b/patches/node-v12.16.1/0001-Disable-running-gyp-on-shared-deps.patch new file mode 100644 index 000000000..f1d6bb737 --- /dev/null +++ b/patches/node-v12.16.1/0001-Disable-running-gyp-on-shared-deps.patch @@ -0,0 +1,21 @@ +From: Zuzana Svetlikova <zsvetlik@redhat.com> +Date: Thu, 27 Apr 2017 14:25:42 +0200 +Subject: [PATCH] Disable running gyp on shared deps + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 05eaa73abbe0..965e4f8560e6 100644 +--- a/Makefile ++++ b/Makefile +@@ -141,7 +141,7 @@ test-code-cache: with-code-cache + echo "'test-code-cache' target is a noop" + + out/Makefile: config.gypi common.gypi node.gyp \ +- deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \ ++ deps/http_parser/http_parser.gyp \ + tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ + tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp + $(PYTHON) tools/gyp_node.py -f make diff --git a/patches/node-v12.16.1/0002-Install-both-binaries-and-use-libdir.patch b/patches/node-v12.16.1/0002-Install-both-binaries-and-use-libdir.patch new file mode 100644 index 000000000..b9dc62bb4 --- /dev/null +++ b/patches/node-v12.16.1/0002-Install-both-binaries-and-use-libdir.patch @@ -0,0 +1,83 @@ +From: Elliott Sales de Andrade <quantum.analyst@gmail.com> +Date: Tue, 19 Mar 2019 23:22:40 -0400 +Subject: [PATCH] Install both binaries and use libdir. + +This allows us to build with a shared library for other users while +still providing the normal executable. + +Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com> +--- + configure.py | 7 +++++++ + tools/install.py | 31 ++++++++++++++----------------- + 2 files changed, 21 insertions(+), 17 deletions(-) + +diff --git a/configure.py b/configure.py +index 14f5665e0299..36a8a413713a 100755 +--- a/configure.py ++++ b/configure.py +@@ -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)') + ++parser.add_option('--libdir', ++ action='store', ++ dest='libdir', ++ default='lib', ++ help='a directory to install the shared library into') ++ + parser.add_option('--without-v8-platform', + action='store_true', + dest='without_v8_platform', +@@ -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 options.dest_os == 'android': +diff --git a/tools/install.py b/tools/install.py +index 655802980a6e..fe4723bf1501 100755 +--- a/tools/install.py ++++ b/tools/install.py +@@ -121,26 +121,23 @@ def subdir_files(path, dest, action): + + def files(action): + is_windows = sys.platform == 'win32' +- output_file = 'node' + output_prefix = 'out/Release/' ++ output_libprefix = output_prefix + +- if 'false' == variables.get('node_shared'): +- if is_windows: +- output_file += '.exe' ++ if is_windows: ++ output_bin = 'node.exe' ++ output_lib = 'node.dll' + else: +- if is_windows: +- output_file += '.dll' +- else: +- output_file = 'lib' + output_file + '.' + variables.get('shlib_suffix') +- # GYP will output to lib.target except on OS X, this is hardcoded +- # in its source - see the _InstallableTargetInstallPath function. +- if sys.platform != 'darwin': +- output_prefix += 'lib.target/' +- +- if 'false' == variables.get('node_shared'): +- action([output_prefix + output_file], 'bin/' + output_file) +- else: +- action([output_prefix + output_file], 'lib/' + output_file) ++ output_bin = 'node' ++ output_lib = 'libnode.' + variables.get('shlib_suffix') ++ # GYP will output to lib.target except on OS X, this is hardcoded ++ # in its source - see the _InstallableTargetInstallPath function. ++ if sys.platform != 'darwin': ++ output_libprefix += 'lib.target/' ++ ++ action([output_prefix + output_bin], 'bin/' + output_bin) ++ if 'true' == variables.get('node_shared'): ++ action([output_libprefix + output_lib], variables.get('libdir') + '/' + output_lib) + + if 'true' == variables.get('node_use_dtrace'): + action(['out/Release/node.d'], 'lib/dtrace/node.d') diff --git a/patches/node-v12.16.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 new file mode 100644 index 000000000..f05bcafd5 --- /dev/null +++ b/patches/node-v12.16.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch @@ -0,0 +1,30 @@ +From: =?UTF-8?q?Ulrich=20=C3=96lmann?= <u.oelmann@pengutronix.de> +Date: Fri, 13 Mar 2020 12:36:49 +0100 +Subject: [PATCH] tools: do not explicitely set an rpath in make generator +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is not necessary as the library is installed into the standard path. + +Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> +--- + tools/gyp/pylib/gyp/generator/make.py | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py +index 91a119c5a576..c109b2b488ec 100644 +--- a/tools/gyp/pylib/gyp/generator/make.py ++++ b/tools/gyp/pylib/gyp/generator/make.py +@@ -1474,11 +1474,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD + target_postbuilds[configname] = target_postbuild + else: + ldflags = config.get('ldflags', []) +- # Compute an rpath for this output if needed. + if any(dep.endswith('.so') or '.so.' in dep for dep in deps): +- # We want to get the literal string "$ORIGIN" into the link command, +- # so we need lots of escaping. +- ldflags.append(r'-Wl,-rpath=\$$ORIGIN/lib.%s/' % self.toolset) + ldflags.append(r'-Wl,-rpath-link=\$(builddir)/lib.%s/' % + self.toolset) + library_dirs = config.get('library_dirs', []) diff --git a/patches/node-v12.16.1/series b/patches/node-v12.16.1/series new file mode 100644 index 000000000..f86c12166 --- /dev/null +++ b/patches/node-v12.16.1/series @@ -0,0 +1,6 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Disable-running-gyp-on-shared-deps.patch +0002-Install-both-binaries-and-use-libdir.patch +0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch +# b4f94a5ae9905853dec0da236e8ee053 - git-ptx-patches magic |