diff options
| author | Khem Raj <raj.khem@gmail.com> | 2022-04-20 11:38:04 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-04-21 07:14:38 -0700 |
| commit | a4e7ad4568ff4bb35155fe67d58e0c175cae89f9 (patch) | |
| tree | 9980bde4e81f6d4fdde25e9619b19f8018955414 | |
| parent | cc8efa1fe957a83452089a082cc23a76bae64c52 (diff) | |
| download | meta-openembedded-a4e7ad4568ff4bb35155fe67d58e0c175cae89f9.tar.gz | |
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 <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb | 10 |
1 files changed, 6 insertions, 4 deletions
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 d0accfaae4..af9256860c 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", "")}" | |||
| 22 | 22 | ||
| 23 | inherit pkgconfig perlnative python3native rust | 23 | inherit pkgconfig perlnative python3native rust |
| 24 | 24 | ||
| 25 | DEPENDS += "zlib cargo-native python3" | 25 | DEPENDS += "zlib cargo-native python3 icu" |
| 26 | DEPENDS:remove:mipsarch = "icu" | ||
| 26 | 27 | ||
| 27 | B = "${WORKDIR}/build" | 28 | B = "${WORKDIR}/build" |
| 28 | 29 | ||
| @@ -39,8 +40,9 @@ export AS = "${CC}" | |||
| 39 | export RUSTFLAGS | 40 | export RUSTFLAGS |
| 40 | 41 | ||
| 41 | JIT ?= "" | 42 | JIT ?= "" |
| 42 | |||
| 43 | JIT:mipsarch = "--disable-jit" | 43 | JIT:mipsarch = "--disable-jit" |
| 44 | ICU ?= "--with-system-icu" | ||
| 45 | ICU:mipsarch = "" | ||
| 44 | 46 | ||
| 45 | do_configure() { | 47 | do_configure() { |
| 46 | cd ${B} | 48 | cd ${B} |
| @@ -52,8 +54,8 @@ do_configure() { | |||
| 52 | --libdir=${libdir} \ | 54 | --libdir=${libdir} \ |
| 53 | --disable-jemalloc \ | 55 | --disable-jemalloc \ |
| 54 | --disable-strip \ | 56 | --disable-strip \ |
| 55 | ${JIT} | 57 | ${JIT} \ |
| 56 | 58 | ${ICU} | |
| 57 | } | 59 | } |
| 58 | 60 | ||
| 59 | do_install() { | 61 | do_install() { |
