From patchwork Mon Aug 8 03:26:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "J. S." X-Patchwork-Id: 11064 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CB0DC00140 for ; Mon, 8 Aug 2022 03:27:05 +0000 (UTC) Received: from mail-oa1-f45.google.com (mail-oa1-f45.google.com [209.85.160.45]) by mx.groups.io with SMTP id smtpd.web10.21300.1659929215554719587 for ; Sun, 07 Aug 2022 20:26:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=p+WnZskc; spf=pass (domain: gmail.com, ip: 209.85.160.45, mailfrom: schonm@gmail.com) Received: by mail-oa1-f45.google.com with SMTP id 586e51a60fabf-10dc1b16c12so9247562fac.6 for ; Sun, 07 Aug 2022 20:26:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:to:subject:message-id:date:from :mime-version:from:to:cc; bh=KdTZr7C2pNseIUh7vpcHUgyM+1szPfXoe4qTv1e5JPw=; b=p+WnZskcBwxb0/T7FRQna8x292WuvN8LDDR3imkPYC4epSky0/FyydG+mSfPZ1vJBY T9qAMGmpN+L5udoHLqPelE3owz92J98OJclsJpdq77k+rKNFnh48Dz6Ub0O+8dJKZrU8 Va0fAcRMM21Lvh6lkb9d1XmVnNiVQsTn9eyniPmBl3oEAxiCBJ1XB4SMfALRLgAFoHnU xw2BTfOR+0EkDuLjg2M/CTsgNxKC9YeNhxZY0rN067B5ifAIUpqbFovbJciWuFF0QisT uHNHMTv9NSsSlFwjiuGWU6pFI2ArZCRMZXpHeqlp3xW9z3A862EF4d6a73eGNls8e5F9 3uZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:to:subject:message-id:date:from :mime-version:x-gm-message-state:from:to:cc; bh=KdTZr7C2pNseIUh7vpcHUgyM+1szPfXoe4qTv1e5JPw=; b=7+htIqNyv54RozERRLaPs+fD1xHHltpFrWkkk4WsxeNMPyhvWgTBJYJcz2ykK6FOcV VU5QguCMG9b74dIIBP0TxiItEYVk0UNRZsLgn3sabBAgVNtB/704R+MrcwOwDJeftPFc U/hqjhoTZcVVVaw8pIdeWfEWFvuB+Ae0sXG6tGkaDhN6cE7jbYNEMYBYtYchhuGh/20w ZrdW0iaoLHw54Qi/+UCjnuBn0D+yXae8U/5CFTtPEn5x1NLPT1z8+Ez0CgQcr9GGeCos 8DiDP2aHPJ5s+VXJMIumKvhJHB5reOLWrFE+nUS6T8oNi7Vse4myfdZxxoKilTGn8VSb dl5Q== X-Gm-Message-State: ACgBeo0VMK63KedIZyNlmimd+7g2SdyrqSkMUt0kMAVzxdFUk7iN9yGe eXDMHfFdc+bdNK3wORCtu5KC2izIZYa4XXAZPimZeGzatTTzgA== X-Google-Smtp-Source: AA6agR7eEmOYxbuOzoR6AHqewudtMRAHk4VVx/d9AfVDdbAJSo71nMW2wlJ25u1sW7sgcRVdacGGkSJtXmHd/YX9xrY= X-Received: by 2002:a05:6870:6087:b0:10b:aef4:db0a with SMTP id t7-20020a056870608700b0010baef4db0amr10741247oae.17.1659929214305; Sun, 07 Aug 2022 20:26:54 -0700 (PDT) MIME-Version: 1.0 From: "J. S." Date: Sun, 7 Aug 2022 23:26:43 -0400 Message-ID: Subject: [oe][meta-oe][PATCH][master-next] nodejs : upgrade 16.14.2 -> 16.16.0 To: openembedded-devel@lists.openembedded.org List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 08 Aug 2022 03:27:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98148 From 337d466bd4433159492b0e18a9f654b6047cc73c Mon Sep 17 00:00:00 2001 From: Jason Schonberg Date: Sun, 7 Aug 2022 22:44:49 -0400 Subject: [PATCH] Upgrade Nodejs from 16.14.2 to 16.16.0. This is the latest LTS version of node. The license file check sum changes because the new license file mentions undici which is licensed under an MIT license. This upgrade provides support for openssl 1.1.1q Additional information about changes since the 16.14.2 release can be found at https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V16.md The existing 16.14.2 patches applied with fuzz against the 16.16.0 release. So they have been updated with devtool. Built against master-next commit 8dee3f24aafab5574db396770342fd62ebbbad17 Signed-off-by: Jason Schonberg --- ...e-running-gyp-files-for-bundled-deps.patch | 6 +-- ...-liftoff-Correct-function-signatures.patch | 30 +++++++++----- ...Use-32bit-cast-for-operand-on-mips32.patch | 6 +-- ...Install-both-binaries-and-use-libdir.patch | 33 ++++++---------- .../nodejs/0002-Using-native-binaries.patch | 22 ++++++----- .../0004-v8-don-t-override-ARM-CFLAGS.patch | 12 +++--- ...5-add-openssl-legacy-provider-option.patch | 30 +++++++------- .../nodejs/nodejs/big-endian.patch | 14 ++++++- .../nodejs/nodejs/mips-less-memory.patch | 39 ++++++++++++------- .../nodejs/nodejs/system-c-ares.patch | 11 +++++- .../{nodejs_16.14.2.bb => nodejs_16.16.0.bb} | 4 +- 11 files changed, 121 insertions(+), 86 deletions(-) rename meta-oe/recipes-devtools/nodejs/{nodejs_16.14.2.bb => nodejs_16.16.0.bb} (97%) S = "${WORKDIR}/node-v${PV}" diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch index d6e439ba2..d30a4d06b 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch @@ -1,4 +1,4 @@ -From 7d94bfe53beeb2d25eb5f2ff6b1d509df7e6ab80 Mon Sep 17 00:00:00 2001 +From 7e9d0939b803c07262d53ba2ea96ead44a4791fa Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Thu, 27 Apr 2017 14:25:42 +0200 Subject: [PATCH] Disable running gyp on shared deps @@ -8,10 +8,10 @@ Subject: [PATCH] Disable running gyp on shared deps 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 93d63110..79caaec2 100644 +index 3c48653..8b5a93b 100644 --- a/Makefile +++ b/Makefile -@@ -138,7 +138,7 @@ with-code-cache test-code-cache: +@@ -147,7 +147,7 @@ with-code-cache test-code-cache: $(warning '$@' target is a noop) out/Makefile: config.gypi common.gypi node.gyp \ diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch index d7005ae97..e7f67875f 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch @@ -1,7 +1,7 @@ -From dc3652c0abcdf8573fd044907b19d8eda7ca1124 Mon Sep 17 00:00:00 2001 +From 2b6e124f1959a7f20c37dd1589a0794499e4d9e5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 20 Oct 2021 12:49:58 -0700 -Subject: [PATCH] [liftoff] Correct function signatures +Subject: [PATCH] Correct function signatures Fixes builds on mips where clang reports an error ../deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h:661:5: error: no matching member function for call to 'Move' @@ -10,13 +10,19 @@ Fixes builds on mips where clang reports an error Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/v8/v8/+/3235674] Signed-off-by: Khem Raj + --- - src/wasm/baseline/liftoff-assembler.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + deps/v8/src/wasm/baseline/liftoff-assembler.h | 6 +++--- + deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h | 2 +- + deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h | 2 +- + .../src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) +diff --git a/deps/v8/src/wasm/baseline/liftoff-assembler.h b/deps/v8/src/wasm/baseline/liftoff-assembler.h +index 19611fb..b035154 100644 --- a/deps/v8/src/wasm/baseline/liftoff-assembler.h +++ b/deps/v8/src/wasm/baseline/liftoff-assembler.h -@@ -613,7 +613,7 @@ class LiftoffAssembler : public TurboAss +@@ -613,7 +613,7 @@ class LiftoffAssembler : public TurboAssembler { void FinishCall(const ValueKindSig*, compiler::CallDescriptor*); // Move {src} into {dst}. {src} and {dst} must be different. @@ -25,7 +31,7 @@ Signed-off-by: Khem Raj // Parallel register move: For a list of tuples , move the // {src} register of kind {kind} into {dst}. If {src} equals {dst}, ignore -@@ -759,8 +759,8 @@ class LiftoffAssembler : public TurboAss +@@ -759,8 +759,8 @@ class LiftoffAssembler : public TurboAssembler { inline void MoveStackValue(uint32_t dst_offset, uint32_t src_offset, ValueKind); @@ -36,9 +42,11 @@ Signed-off-by: Khem Raj inline void Spill(int offset, LiftoffRegister, ValueKind); inline void Spill(int offset, WasmValue); +diff --git a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h +index 4ab036d..20ddf00 100644 --- a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h +++ b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h -@@ -658,7 +658,7 @@ void LiftoffAssembler::Store(Register ds +@@ -658,7 +658,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, pinned = pinned | LiftoffRegList::ForRegs(dst_op.rm(), src); LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); // Save original value. @@ -47,9 +55,11 @@ Signed-off-by: Khem Raj src = tmp; pinned.set(tmp); +diff --git a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h +index 0a23c19..7d816fc 100644 --- a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h +++ b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h -@@ -596,7 +596,7 @@ void LiftoffAssembler::Store(Register ds +@@ -596,7 +596,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, pinned.set(dst_op.rm()); LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); // Save original value. @@ -58,9 +68,11 @@ Signed-off-by: Khem Raj src = tmp; pinned.set(tmp); +diff --git a/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h b/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h +index fef5947..2bf79ee 100644 --- a/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h +++ b/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h -@@ -580,7 +580,7 @@ void LiftoffAssembler::Store(Register ds +@@ -580,7 +580,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, pinned.set(dst_op.rm()); LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); // Save original value. diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-mips-Use-32bit-cast-for-operand-on-mips32.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-mips-Use-32bit-cast-for-operand-on-mips32.patch index a0242d8e1..4932de06e 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-mips-Use-32bit-cast-for-operand-on-mips32.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-mips-Use-32bit-cast-for-operand-on-mips32.patch @@ -1,4 +1,4 @@ -From e65dde8db17da5acddeef7eb9316199c4e5e0811 Mon Sep 17 00:00:00 2001 +From b978652dc3e9c2b74334b91b2a2c9e3ffa13710c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 19 Apr 2022 12:40:25 -0700 Subject: [PATCH] mips: Use 32bit cast for operand on mips32 @@ -12,6 +12,7 @@ deps/v8/src/compiler/backend/mips/code-generator-mips.cc: In member function 'vo Upstream-Status: Pending Signed-off-by: Khem Raj + --- deps/v8/src/compiler/backend/mips/code-generator-mips.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -29,6 +30,3 @@ index 2b8197e..b226140 100644 } } // Functions with JS linkage have at least one parameter (the receiver). --- -2.36.0 - diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Install-both-binaries-and-use-libdir.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Install-both-binaries-and-use-libdir.patch index 5cb2e9701..71d921d59 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Install-both-binaries-and-use-libdir.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Install-both-binaries-and-use-libdir.patch @@ -1,7 +1,10 @@ -From 62ddf8499747fb1e366477d666c0634ad50039a9 Mon Sep 17 00:00:00 2001 +From ffda0714bd301cb9d68ee095ab70e026f61e11aa Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 19 Mar 2019 23:22:40 -0400 -Subject: [PATCH 2/2] Install both binaries and use libdir. +Subject: [PATCH] Install both binaries and use libdir. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit This allows us to build with a shared library for other users while still providing the normal executable. @@ -13,18 +16,17 @@ Upstream-Status: Pending Signed-off-by: Elliott Sales de Andrade Signed-off-by: Andreas Müller Signed-off-by: Khem Raj + --- configure.py | 7 +++++++ tools/install.py | 21 +++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/configure.py b/configure.py -index 6efb98c2316f089f3167e486282593245373af3f..a6d2ec939e4480dfae703f3978067537abf9f0f0 100755 +index fed2688..7989076 100755 --- a/configure.py +++ b/configure.py -@@ -721,10 +721,16 @@ parser.add_argument('--shared', - dest='shared', - default=None, +@@ -739,6 +739,12 @@ parser.add_argument('--shared', help='compile shared library for embedding node in another project. ' + '(This mode is not officially supported for regular applications)') @@ -37,11 +39,7 @@ index 6efb98c2316f089f3167e486282593245373af3f..a6d2ec939e4480dfae703f3978067537 parser.add_argument('--without-v8-platform', action='store_true', dest='without_v8_platform', - default=False, - help='do not initialize v8 platform during node.js startup. ' + -@@ -1305,10 +1311,11 @@ def configure_node(o): - o['variables']['debug_nghttp2'] = 'false' - +@@ -1348,6 +1354,7 @@ def configure_node(o): o['variables']['node_no_browser_globals'] = b(options.no_browser_globals) o['variables']['node_shared'] = b(options.shared) @@ -49,15 +47,11 @@ index 6efb98c2316f089f3167e486282593245373af3f..a6d2ec939e4480dfae703f3978067537 node_module_version = getmoduleversion.get_version() if options.dest_os == 'android': - shlib_suffix = 'so' - elif sys.platform == 'darwin': diff --git a/tools/install.py b/tools/install.py -index 41cc1cbc60a9480cc08df3aa0ebe582c2becc3a2..11208f9e7166ab60da46d5ace2257c239a7e9263 100755 +index 8a050df..40357ad 100755 --- a/tools/install.py +++ b/tools/install.py -@@ -128,26 +128,23 @@ def subdir_files(path, dest, action): - for subdir, files_in_path in ret.items(): - action(files_in_path, subdir + '/') +@@ -130,22 +130,19 @@ def subdir_files(path, dest, action): def files(action): is_windows = sys.platform == 'win32' @@ -89,8 +83,3 @@ index 41cc1cbc60a9480cc08df3aa0ebe582c2becc3a2..11208f9e7166ab60da46d5ace2257c23 if 'true' == variables.get('node_use_dtrace'): action(['out/Release/node.d'], 'lib/dtrace/node.d') - - # behave similarly for systemtap --- -2.33.0 - diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-binaries.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-binaries.patch index 8db1f1dd5..b85863f1a 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-binaries.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-binaries.patch @@ -1,16 +1,18 @@ -From 6c3ac20477a4bac643088f24df3c042e627fafa9 Mon Sep 17 00:00:00 2001 +From c2380b906832f0c4aebd0554a22cfa33ed8a5b8b Mon Sep 17 00:00:00 2001 From: Guillaume Burel Date: Fri, 3 Jan 2020 11:25:54 +0100 Subject: [PATCH] Using native binaries --- - node.gyp | 4 ++-- - tools/v8_gypfiles/v8.gyp | 11 ++++------- - 2 files changed, 6 insertions(+), 9 deletions(-) + node.gyp | 2 ++ + tools/v8_gypfiles/v8.gyp | 5 +++++ + 2 files changed, 7 insertions(+) +diff --git a/node.gyp b/node.gyp +index 74e9f9c..d53465b 100644 --- a/node.gyp +++ b/node.gyp -@@ -294,6 +294,7 @@ +@@ -295,6 +295,7 @@ 'action_name': 'run_mkcodecache', 'process_outputs_as_sources': 1, 'inputs': [ @@ -18,7 +20,7 @@ Subject: [PATCH] Using native binaries '<(mkcodecache_exec)', ], 'outputs': [ -@@ -319,6 +320,7 @@ +@@ -320,6 +321,7 @@ 'action_name': 'node_mksnapshot', 'process_outputs_as_sources': 1, 'inputs': [ @@ -26,6 +28,8 @@ Subject: [PATCH] Using native binaries '<(node_mksnapshot_exec)', ], 'outputs': [ +diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp +index 39b9680..e7b7d90 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -68,6 +68,7 @@ @@ -44,7 +48,7 @@ Subject: [PATCH] Using native binaries '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated', '-v8-root', '<(V8_ROOT)', -@@ -225,6 +227,7 @@ +@@ -211,6 +213,7 @@ { 'action_name': 'generate_bytecode_builtins_list_action', 'inputs': [ @@ -52,7 +56,7 @@ Subject: [PATCH] Using native binaries '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)bytecode_builtins_list_generator<(EXECUTABLE_SUFFIX)', ], 'outputs': [ -@@ -415,6 +418,7 @@ +@@ -395,6 +398,7 @@ ], }, 'inputs': [ @@ -60,7 +64,7 @@ Subject: [PATCH] Using native binaries '<(mksnapshot_exec)', ], 'outputs': [ -@@ -1548,6 +1552,7 @@ +@@ -1503,6 +1507,7 @@ { 'action_name': 'run_gen-regexp-special-case_action', 'inputs': [ diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch index 97ed972ce..501235f23 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch @@ -1,4 +1,4 @@ -From 47ee5cc5501289205d3e8e9f27ea9daf18cebac1 Mon Sep 17 00:00:00 2001 +From e90d7249975d336dd77664923138aa3e2dcd23ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= Date: Sat, 9 Nov 2019 14:45:30 +0000 Subject: [PATCH] v8: don't override ARM CFLAGS @@ -23,15 +23,16 @@ problems have been noted during compilation or runtime. Upstream-Status: Inappropriate [oe-specific] Signed-off-by: André Draszik + --- tools/v8_gypfiles/toolchain.gypi | 52 ++------------------------------ 1 file changed, 2 insertions(+), 50 deletions(-) diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi -index 264b3e478e..0b41848145 100644 +index ecbd63b..0030ced 100644 --- a/tools/v8_gypfiles/toolchain.gypi +++ b/tools/v8_gypfiles/toolchain.gypi -@@ -211,31 +211,7 @@ +@@ -177,31 +177,7 @@ 'target_conditions': [ ['_toolset=="host"', { 'conditions': [ @@ -64,7 +65,7 @@ index 264b3e478e..0b41848145 100644 # Host not built with an Arm CXX compiler (simulator build). 'conditions': [ [ 'arm_float_abi=="hard"', { -@@ -254,31 +230,7 @@ +@@ -220,31 +196,7 @@ }], # _toolset=="host" ['_toolset=="target"', { 'conditions': [ @@ -97,6 +98,3 @@ index 264b3e478e..0b41848145 100644 # Target not built with an Arm CXX compiler (simulator build). 'conditions': [ [ 'arm_float_abi=="hard"', { --- -2.20.1 - diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch index 4d238c03f..04321132c 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch @@ -1,4 +1,4 @@ -From 86d1c0cc6a5dcf57e413a1cc1c29203e87cf9a14 Mon Sep 17 00:00:00 2001 +From 21a93c6305c1a02eb94e6fec62015d3ebb171d9f Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Sat, 16 Oct 2021 08:50:16 +0200 Subject: [PATCH] src: add --openssl-legacy-provider option @@ -22,19 +22,20 @@ Hash { Co-authored-by: Richard Lau Signed-off-by: Signed-off-by: Andrej Valek Upstream-Status: Backport [https://github.com/nodejs/node/issues/40455] + --- doc/api/cli.md | 10 ++++++++++ src/crypto/crypto_util.cc | 10 ++++++++++ - src/node_options.cc | 10 ++++++++++ + src/node_options.cc | 3 +++ src/node_options.h | 7 +++++++ .../test-process-env-allowed-flags-are-documented.js | 5 +++++ - 5 files changed, 42 insertions(+) + 5 files changed, 35 insertions(+) diff --git a/doc/api/cli.md b/doc/api/cli.md -index 74057706bf8d..608b9cdeddf1 100644 +index 475894d..b0c49d4 100644 --- a/doc/api/cli.md +++ b/doc/api/cli.md -@@ -687,6 +687,14 @@ Load an OpenSSL configuration file on startup. Among other uses, this can be +@@ -732,6 +732,14 @@ Load an OpenSSL configuration file on startup. Among other uses, this can be used to enable FIPS-compliant crypto if Node.js is built against FIPS-enabled OpenSSL. @@ -49,7 +50,7 @@ index 74057706bf8d..608b9cdeddf1 100644 ### `--pending-deprecation`