summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2024-11-23 19:58:54 +0100
committerKhem Raj <raj.khem@gmail.com>2024-11-23 18:36:29 -0800
commit5dcb1a2473464394503fbd839f89189317227835 (patch)
treeee78e36a829dc6d2ceac1724378b9ee751f0ec4f
parent19bd24d22d770f99f42fd0b6e5fbb62752d4cd51 (diff)
downloadmeta-openembedded-5dcb1a2473464394503fbd839f89189317227835.tar.gz
nodejs: backport a patch to fix build with icu-76
* icu was upgraded in oe-core in: https://git.openembedded.org/openembedded-core/commit/?id=ef2bd18dd1db7e5f01db76889933bfdbb5415aaf nodejs is now failing to link: TOPDIR/BUILD/hosttools/ld: nodejs/22.11.0/node-v22.11.0/out/Release/obj.host/gen-regexp-special-case/deps/v8/src/regexp/gen-regexp-special-case.o: in function `v8::internal::PrintSet(std::basic_ofstream<char, std::char_traits<char> >&, char const*, icu_76::UnicodeSet const&)': gen-regexp-special-case.cc:(.text._ZN2v88internal8PrintSetERSt14basic_ofstreamIcSt11char_traitsIcEEPKcRKN6icu_7610UnicodeSetE+0x8b): undefined reference to `icu_76::UnicodeSet::getRangeStart(int) const' TOPDIR/BUILD/hosttools/ld: gen-regexp-special-case.cc:(.text._ZN2v88internal8PrintSetERSt14basic_ofstreamIcSt11char_traitsIcEEPKcRKN6icu_7610UnicodeSetE+0xb6): undefined reference to `icu_76::UnicodeSet::getRangeEnd(int) const' TOPDIR/BUILD/hosttools/ld: gen-regexp-special-case.cc:(.text._ZN2v88internal8PrintSetERSt14basic_ofstreamIcSt11char_traitsIcEEPKcRKN6icu_7610UnicodeSetE+0xdf): undefined reference to `icu_76::UnicodeSet::getRangeCount() const' TOPDIR/BUILD/hosttools/ld: gen-regexp-special-case.cc:(.text._ZN2v88internal8PrintSetERSt14basic_ofstreamIcSt11char_traitsIcEEPKcRKN6icu_7610UnicodeSetE+0xed): undefined reference to `icu_76::UnicodeSet::getRangeStart(int) const' TOPDIR/BUILD/hosttools/ld: gen-regexp-special-case.cc:(.text._ZN2v88internal8PrintSetERSt14basic_ofstreamIcSt11char_traitsIcEEPKcRKN6icu_7610UnicodeSetE+0xfa): undefined reference to `icu_76::UnicodeSet::getRangeEnd(int) const' TOPDIR/BUILD/hosttools/ld: gen-regexp-special-case.cc:(.text._ZN2v88internal8PrintSetERSt14basic_ofstreamIcSt11char_traitsIcEEPKcRKN6icu_7610UnicodeSetE+0x121): undefined reference to `icu_76::UnicodeSet::getRangeStart(int) const' TOPDIR/BUILD/hosttools/ld: nodejs/22.11.0/node-v22.11.0/out/Release/obj.host/gen-regexp-special-case/deps/v8/src/regexp/gen-regexp-special-case.o: in function `v8::internal::PrintSpecial(std::basic_ofstream<char, std::char_traits<char> >&)': gen-regexp-special-case.cc:(.text._ZN2v88internal12PrintSpecialERSt14basic_ofstreamIcSt11char_traitsIcEE+0x43): undefined reference to `icu_76::UnicodeSet::UnicodeSet()' TOPDIR/BUILD/hosttools/ld: gen-regexp-special-case.cc:(.text._ZN2v88internal12PrintSpecialERSt14basic_ofstreamIcSt11char_traitsIcEE+0x59): undefined reference to `icu_76::UnicodeSet::UnicodeSet()' ... Signed-off-by: Martin Jansa <martin.jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/nodejs/nodejs/fix-build-with-icu-76.patch29
-rw-r--r--meta-oe/recipes-devtools/nodejs/nodejs_22.11.0.bb1
2 files changed, 30 insertions, 0 deletions
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
new file mode 100644
index 0000000000..e8501bcdbe
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/fix-build-with-icu-76.patch
@@ -0,0 +1,29 @@
1From 54299ac3a3d4e4520b8604dce43c2584092ccde2 Mon Sep 17 00:00:00 2001
2From: Michael Cho <michael@michaelcho.dev>
3Date: Sun, 27 Oct 2024 10:08:07 -0400
4Subject: [PATCH] build: fix building with system icu 76
5
6ICU 76 decided to reduce overlinking[^1] thus `icu-i18n` will no longer
7add `icu-uc` when linking to shared libraries. This results in undefined
8symbols/references when trying to build with system ICU 76.
9
10[^1]: unicode-org/icu@199bc82
11
12Upstream-Status: Backport [https://github.com/nodejs/node/commit/81517faceac86497b3c8717837f491aa29a5e0f9]
13---
14 configure.py | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/configure.py b/configure.py
18index 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.11.0.bb
index 49a5f350d9..8cbf539789 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_22.11.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_22.11.0.bb
@@ -28,6 +28,7 @@ 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 \
31 file://run-ptest \ 32 file://run-ptest \
32 " 33 "
33SRC_URI:append:class-target = " \ 34SRC_URI:append:class-target = " \