Skip to contentSkip to conversation

mozjs-91: Add option to use system ICU

PATCH New Khem Raj 1 participant 1 message Apr 21, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 mozjs-91: Add option to use system ICU

ARM needs to use system icu, otherwise build fails with gcc-12

firefox-91.8.0/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

Keep using vendored ICU on mips since this breaks build for gjs introspection code which is run under qemu-user

---
 meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb +6 -4
index d0accfaae4..af9256860c 100644
@@ -22,7 +22,8 @@ S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}"
 
 inherit pkgconfig perlnative python3native rust
 
-DEPENDS += "zlib cargo-native python3"
+DEPENDS += "zlib cargo-native python3 icu"
+DEPENDS:remove:mipsarch = "icu"
 
 B = "${WORKDIR}/build"
 
@@ -39,8 +40,9 @@ export AS = "${CC}"
 export RUSTFLAGS
 
 JIT ?= ""
-
 JIT:mipsarch = "--disable-jit"
+ICU ?= "--with-system-icu"
+ICU:mipsarch = ""
 
 do_configure() {
     cd ${B}
@@ -52,8 +54,8 @@ do_configure() {
         --libdir=${libdir} \
         --disable-jemalloc \
         --disable-strip \
-        ${JIT}
-
+        ${JIT} \
+        ${ICU}
 }
 
 do_install() {
Signature · 1 line
2.36.0