diff mbox series

[meta-oe] nodejs: backport a patch to fix build with icu-76

Message ID 20241123185854.2332152-1-martin.jansa@gmail.com
State New
Headers show
Series [meta-oe] nodejs: backport a patch to fix build with icu-76 | expand

Commit Message

Martin Jansa Nov. 23, 2024, 6:58 p.m. UTC 
* 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>
---
 .../nodejs/nodejs/fix-build-with-icu-76.patch | 29 +++++++++++++++++++
 .../recipes-devtools/nodejs/nodejs_22.11.0.bb |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/fix-build-with-icu-76.patch

Comments

Khem Raj Nov. 23, 2024, 7:19 p.m. UTC | #1 
I had a local patch for this already, check master-next.

On Sat, Nov 23, 2024 at 10:59 AM Martin Jansa via
lists.openembedded.org <martin.jansa=gmail.com@lists.openembedded.org>
wrote:
>
> * 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>
> ---
>  .../nodejs/nodejs/fix-build-with-icu-76.patch | 29 +++++++++++++++++++
>  .../recipes-devtools/nodejs/nodejs_22.11.0.bb |  1 +
>  2 files changed, 30 insertions(+)
>  create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/fix-build-with-icu-76.patch
>
> 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 @@
> +From 54299ac3a3d4e4520b8604dce43c2584092ccde2 Mon Sep 17 00:00:00 2001
> +From: Michael Cho <michael@michaelcho.dev>
> +Date: Sun, 27 Oct 2024 10:08:07 -0400
> +Subject: [PATCH] build: fix building with system icu 76
> +
> +ICU 76 decided to reduce overlinking[^1] thus `icu-i18n` will no longer
> +add `icu-uc` when linking to shared libraries. This results in undefined
> +symbols/references when trying to build with system ICU 76.
> +
> +[^1]: unicode-org/icu@199bc82
> +
> +Upstream-Status: Backport [https://github.com/nodejs/node/commit/81517faceac86497b3c8717837f491aa29a5e0f9]
> +---
> + configure.py | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.py b/configure.py
> +index a5f47af1748903..a4e210261e2e76 100755
> +--- a/configure.py
> ++++ b/configure.py
> +@@ -1879,7 +1879,7 @@ def icu_download(path):
> +   elif with_intl == 'system-icu':
> +     # ICU from pkg-config.
> +     o['variables']['v8_enable_i18n_support'] = 1
> +-    pkgicu = pkg_config('icu-i18n')
> ++    pkgicu = pkg_config(['icu-i18n', 'icu-uc'])
> +     if not pkgicu[0]:
> +       error('''Could not load pkg-config data for "icu-i18n".
> +        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 \
>             file://0001-deps-disable-io_uring-support-in-libuv.patch \
>             file://0001-positional-args.patch \
>             file://0001-custom-env.patch \
> +           file://fix-build-with-icu-76.patch \
>             file://run-ptest \
>             "
>  SRC_URI:append:class-target = " \
> --
> 2.47.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#114018): https://lists.openembedded.org/g/openembedded-devel/message/114018
> Mute This Topic: https://lists.openembedded.org/mt/109744371/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

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 @@ 
+From 54299ac3a3d4e4520b8604dce43c2584092ccde2 Mon Sep 17 00:00:00 2001
+From: Michael Cho <michael@michaelcho.dev>
+Date: Sun, 27 Oct 2024 10:08:07 -0400
+Subject: [PATCH] build: fix building with system icu 76
+
+ICU 76 decided to reduce overlinking[^1] thus `icu-i18n` will no longer
+add `icu-uc` when linking to shared libraries. This results in undefined
+symbols/references when trying to build with system ICU 76.
+
+[^1]: unicode-org/icu@199bc82
+
+Upstream-Status: Backport [https://github.com/nodejs/node/commit/81517faceac86497b3c8717837f491aa29a5e0f9]
+---
+ configure.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.py b/configure.py
+index a5f47af1748903..a4e210261e2e76 100755
+--- a/configure.py
++++ b/configure.py
+@@ -1879,7 +1879,7 @@ def icu_download(path):
+   elif with_intl == 'system-icu':
+     # ICU from pkg-config.
+     o['variables']['v8_enable_i18n_support'] = 1
+-    pkgicu = pkg_config('icu-i18n')
++    pkgicu = pkg_config(['icu-i18n', 'icu-uc'])
+     if not pkgicu[0]:
+       error('''Could not load pkg-config data for "icu-i18n".
+        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 \
            file://0001-deps-disable-io_uring-support-in-libuv.patch \
            file://0001-positional-args.patch \
            file://0001-custom-env.patch \
+           file://fix-build-with-icu-76.patch \
            file://run-ptest \
            "
 SRC_URI:append:class-target = " \