diff options
Diffstat (limited to 'meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb')
| -rw-r--r-- | meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb b/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb index 4f2da492fb..9466c62aac 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb @@ -3,42 +3,45 @@ HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonk LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf" -SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \ - file://0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch \ - file://0010-fix-cross-compilation-on-i586-targets.patch \ - file://0001-do-not-create-python-environment.patch \ - file://0002-fix-cannot-find-link.patch \ - file://0003-workaround-autoconf-2.13-detection-failed.patch \ - file://0005-fix-do_compile-failed-on-mips.patch \ - file://add-riscv-support.patch \ - file://0001-mozjs-fix-coredump-caused-by-getenv.patch \ - file://format-overflow.patch \ - file://0001-To-fix-build-error-on-arm32BE.patch \ - file://JS_PUBLIC_API.patch \ - file://0001-riscv-Disable-atomic-operations.patch \ - file://fallback-to-2011-C++-standard.patch \ - " +SRC_URI = " \ + https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \ + file://0001-Port-build-to-python3.patch \ + file://0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch \ + file://0003-fix-cross-compilation-on-i586-targets.patch \ + file://0004-do-not-create-python-environment.patch \ + file://0005-fix-cannot-find-link.patch \ + file://0006-workaround-autoconf-2.13-detection-failed.patch \ + file://0007-fix-do_compile-failed-on-mips.patch \ + file://0008-add-riscv-support.patch \ + file://0009-mozjs-fix-coredump-caused-by-getenv.patch \ + file://0010-format-overflow.patch \ + file://0011-To-fix-build-error-on-arm32BE.patch \ + file://0012-JS_PUBLIC_API.patch \ + file://0013-riscv-Disable-atomic-operations.patch \ + file://0014-fallback-to-2011-C++-standard.patch \ +" SRC_URI_append_libc-musl = " \ - file://0006-support-musl.patch \ - file://0001-js-Fix-build-with-musl.patch \ - " + file://musl/0001-support-musl.patch \ + file://musl/0002-js-Fix-build-with-musl.patch \ +" SRC_URI_append_mipsarchn32 = " \ - file://0001-fix-compiling-failure-on-mips64-n32-bsp.patch \ - " + file://mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch \ +" SRC_URI[md5sum] = "69a0be9ce695e5dc4941ed0c78ef00c2" SRC_URI[sha256sum] = "9f453c8cc5669e46e38f977764d49a36295bf0d023619d9aac782e6bb3e8c53f" S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" -inherit autotools pkgconfig perlnative ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)} +inherit autotools pkgconfig perlnative python3native inherit features_check CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold" -DEPENDS += "nspr zlib autoconf-2.13-native \ - python-six-native python-pytoml-native \ - python-jsmin-native python-futures-native \ - python-which-native" +DEPENDS += " \ + nspr zlib autoconf-2.13-native \ + python3-six-native python3-pytoml-native \ + python3-jsmin-native python3-six \ +" # Disable null pointer optimization in gcc >= 6 # https://bugzilla.redhat.com/show_bug.cgi?id=1328045 @@ -82,7 +85,7 @@ do_configure() { export SHELL="/bin/sh" cd ${S} # Add mozjs python-modules necessary - PYTHONPATH="$PYTHONPATH:${S}/config:${S}/build" + PYTHONPATH="${S}/third_party/python/which:${S}/config:${S}/build" for sub_dir in python testing/mozbase; do for module_dir in `ls $sub_dir -1`;do [ $module_dir = "virtualenv" ] && continue @@ -96,7 +99,6 @@ do_configure() { cd ${S}/js/src autoconf213 --macrodir=${STAGING_DATADIR_NATIVE}/autoconf213 old-configure.in > old-configure - sed -i 's:refresh = True:refresh = False:g' ${S}/build/moz.configure/old.configure cd ${B} ${S}/js/src/configure ${EXTRA_OECONF} |