diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-03-03 17:06:56 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-03-04 13:41:13 -0800 |
commit | a4491a3e3ef0a73a3b3036808c1d244d43f925f0 (patch) | |
tree | e4487dbb8886724826ee1a7d96eb989965ae3bf0 /meta-oe/recipes-devtools/nodejs | |
parent | cbec25e1bc62f4fc45f5aaebd7bb0cc037153fec (diff) | |
download | meta-openembedded-a4491a3e3ef0a73a3b3036808c1d244d43f925f0.tar.gz |
nodejs: Upgrade to 18.14.2
License-Update: Add base64 license information [1] and postject [2]
[1] https://github.com/nodejs/node/commit/2ec8092e2cf70267e765dfe4baf13d72838a58ed
[2] https://github.com/nodejs/node/commit/4aaec0726694ad0d3cb05d7f2593a90363c32f32
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/nodejs')
-rwxr-xr-x | meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.14/oe-npm-cache (renamed from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.12/oe-npm-cache) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.14.bb (renamed from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.12.bb) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch | 6 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch | 70 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs_18.14.2.bb (renamed from meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb) | 7 |
5 files changed, 5 insertions, 78 deletions
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.12/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.14/oe-npm-cache index f596207648..f596207648 100755 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.12/oe-npm-cache +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.14/oe-npm-cache diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.12.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.14.bb index a61dd5018f..a61dd5018f 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.12.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.14.bb 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 e949c635b0..356c98d176 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 @@ -33,16 +33,14 @@ do_unpack[postfuncs] += "prune_sources" Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile b/Makefile -index 93d63110..79caaec2 100644 --- a/Makefile +++ b/Makefile -@@ -138,7 +138,7 @@ with-code-cache test-code-cache: +@@ -169,7 +169,7 @@ with-code-cache test-code-cache: $(warning '$@' target is a noop) out/Makefile: config.gypi common.gypi node.gyp \ - deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \ + deps/llhttp/llhttp.gyp \ + deps/simdutf/simdutf.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/meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch b/meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch deleted file mode 100644 index be82c3369c..0000000000 --- a/meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 0be1c5728173ea9ac42843058e26b6268568acf0 Mon Sep 17 00:00:00 2001 -From: Jiawen Geng <technicalcute@gmail.com> -Date: Fri, 14 Oct 2022 09:54:33 +0800 -Subject: [PATCH] deps: V8: cherry-pick c2792e58035f -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Original commit message: - - [base] Fix build with gcc-13 - - See https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes. - - Also see Gentoo Linux bug report: https://bugs.gentoo.org/865981 - - Change-Id: I421f396b02ba37e12ee70048ee33e034f8113566 - Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3934140 - Reviewed-by: Clemens Backes <clemensb@chromium.org> - Reviewed-by: Simon Zünd <szuend@chromium.org> - Commit-Queue: Clemens Backes <clemensb@chromium.org> - Cr-Commit-Position: refs/heads/main@{#83587} - -Refs: https://github.com/v8/v8/commit/c2792e58035fcbaa16d0cb70998852fbeb5df4cc -PR-URL: https://github.com/nodejs/node/pull/44961 -Fixes: https://github.com/nodejs/node/issues/43642 -Reviewed-By: Michaël Zasso <targos@protonmail.com> -Reviewed-By: Richard Lau <rlau@redhat.com> -Reviewed-By: Luigi Pinca <luigipinca@gmail.com> -Reviewed-By: Colin Ihrig <cjihrig@gmail.com> - -Upstream-Status: Backport [https://github.com/nodejs/node/commit/0be1c5728173ea9ac42843058e26b6268568acf0] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - common.gypi | 2 +- - deps/v8/AUTHORS | 1 + - deps/v8/src/base/logging.h | 1 + - deps/v8/src/inspector/v8-string-conversions.h | 1 + - 4 files changed, 4 insertions(+), 1 deletion(-) - ---- a/deps/v8/AUTHORS -+++ b/deps/v8/AUTHORS -@@ -247,6 +247,7 @@ Vlad Burlik <vladbph@gmail.com> - Vladimir Krivosheev <develar@gmail.com> - Vladimir Shutoff <vovan@shutoff.ru> - Wael Almattar <waelsy123@gmail.com> -+WANG Xuerui <git@xen0n.name> - Wei Wu <lazyparser@gmail.com> - Wenlu Wang <kingwenlu@gmail.com> - Wenming Yang <yangwenming@bytedance.com> ---- a/deps/v8/src/base/logging.h -+++ b/deps/v8/src/base/logging.h -@@ -5,6 +5,7 @@ - #ifndef V8_BASE_LOGGING_H_ - #define V8_BASE_LOGGING_H_ - -+#include <cstdint> - #include <cstring> - #include <sstream> - #include <string> ---- a/deps/v8/src/inspector/v8-string-conversions.h -+++ b/deps/v8/src/inspector/v8-string-conversions.h -@@ -5,6 +5,7 @@ - #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ - #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ - -+#include <cstdint> - #include <string> - - // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_18.14.2.bb index 802c4191bb..c92c373746 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.14.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" -LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dfd7ae796baf5326016a3865ee1dc632" +LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2dff1ccca11e333f1388e34f7e2d1de3" CVE_PRODUCT = "nodejs node.js" @@ -27,7 +27,6 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://system-c-ares.patch \ file://0001-liftoff-Correct-function-signatures.patch \ file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \ - file://gcc13.patch \ " SRC_URI:append:class-target = " \ @@ -39,7 +38,7 @@ SRC_URI:append:toolchain-clang:x86 = " \ SRC_URI:append:toolchain-clang:powerpc64le = " \ file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ " -SRC_URI[sha256sum] = "4fa406451bc52659a290e52cfdb2162a760bd549da4b8bbebe6a29f296d938df" +SRC_URI[sha256sum] = "fbc364dd25fee2cacc0f2033db2d86115fc07575310ea0e64408b8170d09c685" S = "${WORKDIR}/node-v${PV}" |