diff options
| author | Jason Schonberg <schonm@gmail.com> | 2024-12-03 23:54:07 -0500 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-12-03 22:06:53 -0800 |
| commit | d6fe4dc9aec5d2c7a471a572c352132c31149df0 (patch) | |
| tree | 2bdf1c7ae9b5f9b03620185ee4c213d1e1b42f32 /meta-oe/recipes-devtools/nodejs | |
| parent | 639045494095617e9c2258f9e9e905dc8192e022 (diff) | |
| download | meta-openembedded-d6fe4dc9aec5d2c7a471a572c352132c31149df0.tar.gz | |
nodejs: upgrade 22.11.0 -> 22.12.0
License-Update: Add JSON parsing library under MIT license.
https://github.com/nodejs/node/pull/56040/commits/27bcd103e775e00eb8d03ac37052bbd4ccb6d239
Drop backported patch fix-build-with-icu-76.patch. It is already
integrated in this version https://github.com/nodejs/node/pull/56040/commits/c3ca978d9c73d1a96f4d5c7bfa3c10ce786b8fe9
Changelog: https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V22.md#22.12.0
Signed-off-by: Jason Schonberg <schonm@gmail.com>
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-22.12/oe-npm-cache (renamed from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.11/oe-npm-cache) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.12.bb (renamed from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.11.bb) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs/fix-build-with-icu-76.patch | 29 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs_22.12.0.bb (renamed from meta-oe/recipes-devtools/nodejs/nodejs_22.11.0.bb) | 5 |
4 files changed, 2 insertions, 32 deletions
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.11/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.12/oe-npm-cache index eb0f143eae..eb0f143eae 100755 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.11/oe-npm-cache +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.12/oe-npm-cache | |||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.11.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.12.bb index d4b818f967..d4b818f967 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.11.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.12.bb | |||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/fix-build-with-icu-76.patch b/meta-oe/recipes-devtools/nodejs/nodejs/fix-build-with-icu-76.patch deleted file mode 100644 index e8501bcdbe..0000000000 --- a/meta-oe/recipes-devtools/nodejs/nodejs/fix-build-with-icu-76.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | From 54299ac3a3d4e4520b8604dce43c2584092ccde2 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Michael Cho <michael@michaelcho.dev> | ||
| 3 | Date: Sun, 27 Oct 2024 10:08:07 -0400 | ||
| 4 | Subject: [PATCH] build: fix building with system icu 76 | ||
| 5 | |||
| 6 | ICU 76 decided to reduce overlinking[^1] thus `icu-i18n` will no longer | ||
| 7 | add `icu-uc` when linking to shared libraries. This results in undefined | ||
| 8 | symbols/references when trying to build with system ICU 76. | ||
| 9 | |||
| 10 | [^1]: unicode-org/icu@199bc82 | ||
| 11 | |||
| 12 | Upstream-Status: Backport [https://github.com/nodejs/node/commit/81517faceac86497b3c8717837f491aa29a5e0f9] | ||
| 13 | --- | ||
| 14 | configure.py | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/configure.py b/configure.py | ||
| 18 | index a5f47af1748903..a4e210261e2e76 100755 | ||
| 19 | --- a/configure.py | ||
| 20 | +++ b/configure.py | ||
| 21 | @@ -1879,7 +1879,7 @@ def icu_download(path): | ||
| 22 | elif with_intl == 'system-icu': | ||
| 23 | # ICU from pkg-config. | ||
| 24 | o['variables']['v8_enable_i18n_support'] = 1 | ||
| 25 | - pkgicu = pkg_config('icu-i18n') | ||
| 26 | + pkgicu = pkg_config(['icu-i18n', 'icu-uc']) | ||
| 27 | if not pkgicu[0]: | ||
| 28 | error('''Could not load pkg-config data for "icu-i18n". | ||
| 29 | See above errors or the README.md.''') | ||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_22.11.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_22.12.0.bb index 8cbf539789..194df4c336 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_22.11.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_22.12.0.bb | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" | 1 | DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" |
| 2 | HOMEPAGE = "http://nodejs.org" | 2 | HOMEPAGE = "http://nodejs.org" |
| 3 | LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" | 3 | LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=25e89142a2f4b075904a9986c45fbdb2" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0bd28a461eccad39f85a29e33e8f879f" |
| 5 | 5 | ||
| 6 | CVE_PRODUCT = "nodejs node.js" | 6 | CVE_PRODUCT = "nodejs node.js" |
| 7 | 7 | ||
| @@ -28,7 +28,6 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ | |||
| 28 | file://0001-deps-disable-io_uring-support-in-libuv.patch \ | 28 | file://0001-deps-disable-io_uring-support-in-libuv.patch \ |
| 29 | file://0001-positional-args.patch \ | 29 | file://0001-positional-args.patch \ |
| 30 | file://0001-custom-env.patch \ | 30 | file://0001-custom-env.patch \ |
| 31 | file://fix-build-with-icu-76.patch \ | ||
| 32 | file://run-ptest \ | 31 | file://run-ptest \ |
| 33 | " | 32 | " |
| 34 | SRC_URI:append:class-target = " \ | 33 | SRC_URI:append:class-target = " \ |
| @@ -37,7 +36,7 @@ SRC_URI:append:class-target = " \ | |||
| 37 | SRC_URI:append:toolchain-clang:powerpc64le = " \ | 36 | SRC_URI:append:toolchain-clang:powerpc64le = " \ |
| 38 | file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ | 37 | file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ |
| 39 | " | 38 | " |
| 40 | SRC_URI[sha256sum] = "bbf0297761d53aefda9d7855c57c7d2c272b83a7b5bad4fea9cb29006d8e1d35" | 39 | SRC_URI[sha256sum] = "fe1bc4be004dc12721ea2cb671b08a21de01c6976960ef8a1248798589679e16" |
| 41 | 40 | ||
| 42 | S = "${WORKDIR}/node-v${PV}" | 41 | S = "${WORKDIR}/node-v${PV}" |
| 43 | 42 | ||
