From 0aff7abedc1c7727c88029a123107f4faf5ba4f1 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 20 Jul 2018 22:14:37 +0800 Subject: mozjs: add support for mips64-n32 - Tweak configure for mips64-n32 - Disable gold linker which not supported by mips64-n32 - Since n32 and n64 use the same registers, add n32 to n64's register definition. Signed-off-by: Hongxu Jia Signed-off-by: Khem Raj --- meta-oe/recipes-extended/mozjs/mozjs_52.8.1.bb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'meta-oe/recipes-extended/mozjs/mozjs_52.8.1.bb') diff --git a/meta-oe/recipes-extended/mozjs/mozjs_52.8.1.bb b/meta-oe/recipes-extended/mozjs/mozjs_52.8.1.bb index 7909602825..599681215b 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs_52.8.1.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs_52.8.1.bb @@ -15,12 +15,18 @@ SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/m/mozjs52/mozjs52_52.8.1.o SRC_URI_append_libc-musl = " \ file://0006-support-musl.patch \ " +SRC_URI_append_mipsarchn32 = " \ + file://0001-fix-compiling-failure-on-mips64-n32-bsp.patch \ + " SRC_URI[md5sum] = "3a44c2fd3d7b5a370ed9184163c74bc4" SRC_URI[sha256sum] = "fb5e11b7f31a33be820d5c947c5fa114751b0d5033778c1cd8e0cf2dad91e8fa" inherit autotools pkgconfig perlnative pythonnative +inherit distro_features_check +CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold" + DEPENDS += "nspr zlib" # nspr's package-config is ignored so set libs manually @@ -31,6 +37,7 @@ EXTRA_OECONF = " \ --libdir=${libdir} \ --disable-tests \ --with-nspr-libs='-lplds4 -lplc4 -lnspr4' \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -- cgit 1.2.3-korg