From a4e7ad4568ff4bb35155fe67d58e0c175cae89f9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 20 Apr 2022 11:38:04 -0700 Subject: 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 Signed-off-by: Khem Raj --- meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meta-oe/recipes-extended') diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb index d0accfaae..af9256860 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb @@ -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() { -- cgit v1.2.3-54-g00ecf