[meta-oe][PATCH 1/3] mozjs-91: Use system icu

[meta-oe][PATCH 1/3] mozjs-91: Use system icu

[Khem Raj]

vendored icu fails to build with gcc12

Fixes
icu/source/common/stringtriebuilder.cpp:388: more undefined references to `std::type_info::operator==(std::type_info const&) const' follow
collect2: error: ld returned 1 exit status

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb
index dd02ed94cb..f047e5e960 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb
+++ b/meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb
@@ -22,7 +22,7 @@ S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}"
 
 inherit pkgconfig perlnative python3native rust
 
-DEPENDS += "zlib cargo-native python3"
+DEPENDS += "zlib cargo-native python3 icu"
 
 B = "${WORKDIR}/build"
 
@@ -50,6 +50,7 @@ do_configure() {
         --host=${BUILD_SYS} \
         --prefix=${prefix} \
         --libdir=${libdir} \
+        --with-system-icu \
         --disable-jemalloc \
         ${JIT}
 
-- 
2.36.0

[meta-oe][PATCH 2/3] mozjs-91: Upgrade to 91.8.0

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../mozjs/{mozjs-91_91.4.0.bb => mozjs-91_91.8.0.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-extended/mozjs/{mozjs-91_91.4.0.bb => mozjs-91_91.8.0.bb} (96%)

diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb
similarity index 96%
rename from meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb
rename to meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb
index f047e5e960..b04634caa1 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb
+++ b/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb
@@ -16,7 +16,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire
            file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \
            file://0001-rewrite-cargo-host-linker-in-python3.patch  \
            "
-SRC_URI[sha256sum] = "e722829db490f9332712a81c35996541737bbfb05232d47190fee779c4fcb327"
+SRC_URI[sha256sum] = "d483a853cbf5c7f93621093432e3dc0b7ed847f2a5318b964828d19f9f087f3a"
 
 S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}"
 
-- 
2.36.0

[meta-oe][PATCH 3/3] mozjs-78: Switch to system libicu

[Khem Raj]

Fixes build with gcc-12
intl/icu/source/common/stringtriebuilder.cpp:388: more undefined references to `std::type_info::operator==(std::type_info const&) const' follow
collect2: error: ld returned 1 exit status

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb
index 3700d88c24..c23950301e 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb
@@ -27,6 +27,7 @@ S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}"
 DEPENDS = " \
     autoconf-2.13-native \
     icu-native \
+    icu \
     cargo-native \
     zlib \
     python3-six \
@@ -48,6 +49,7 @@ EXTRA_OECONF = " \
     --without-system-icu \
     --disable-tests --disable-strip --disable-optimize \
     --disable-jemalloc \
+    --with-system-icu \
     ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \
     ${JIT} \
 "
-- 
2.36.0