diff options
Diffstat (limited to 'meta-openembedded/meta-oe/dynamic-layers/meta-python')
4 files changed, 144 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-include-needed-c-header.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-include-needed-c-header.patch new file mode 100644 index 000000000..581c2390e --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-include-needed-c-header.patch @@ -0,0 +1,29 @@ +From 383b1dda4800c2514cb31446cd7478692d7d26cf Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 3 Mar 2021 12:43:16 -0800 +Subject: [PATCH] include needed c++ header + +Fixes +plan_stats.h:214:10: error: 'optional' in namespace 'std' does not name a template type + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/mongo/db/exec/plan_stats.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/mongo/db/exec/plan_stats.h b/src/mongo/db/exec/plan_stats.h +index ea75f673b8..0cc9b4636d 100644 +--- a/src/mongo/db/exec/plan_stats.h ++++ b/src/mongo/db/exec/plan_stats.h +@@ -31,6 +31,7 @@ + + #include <cstdint> + #include <cstdlib> ++#include <optional> + #include <string> + #include <vector> + +-- +2.30.1 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index a15349848..d0c4eba7e 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -27,6 +27,7 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4 \ file://1296.patch \ file://0001-Fix-compilation-with-fno-common.patch \ file://0001-stacktrace-Define-ARCH_BITS-for-x86.patch \ + file://0001-include-needed-c-header.patch \ " SRC_URI_append_libc-musl ="\ file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \ diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0014-remove-JS_VOLATIME_ARM.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0014-remove-JS_VOLATIME_ARM.patch new file mode 100644 index 000000000..a20873cb0 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0014-remove-JS_VOLATIME_ARM.patch @@ -0,0 +1,111 @@ +# HG changeset patch +# User Lars T Hansen <lhansen@mozilla.com> +# Date 1538489772 -7200 +# Node ID bb430eaf5521aa8ab233a45b585ff9e5dfecf4c9 +# Parent e87d7028568e721e8d297ce62f9622e74d29bb37 +Bug 1495731 - remove JS_VOLATILE_ARM, it is no longer relevant. r=waldo + +JS_VOLATILE_ARM was a workaround for a gcc 4.7 bug on B2G where it +would generate unaligned word accesses that should have been +individual byte accesses. We now require at least gcc 6.1 (and ARM +systems support unaligned accesses). + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport [https://hg.mozilla.org/integration/mozilla-inbound/rev/bb430eaf5521] + +--- a/js/src/vm/TypedArrayObject-inl.h ++++ b/js/src/vm/TypedArrayObject-inl.h +@@ -259,68 +259,61 @@ class ElementSpecific { + return true; + } + +- // Inhibit unaligned accesses on ARM (bug 1097253, a compiler bug). +-#if defined(__arm__) && defined(__GNUC__) && !defined(__clang__) +-#define JS_VOLATILE_ARM volatile +-#else +-#define JS_VOLATILE_ARM +-#endif +- + SharedMem<void*> data = Ops::extract(source); + switch (source->type()) { + case Scalar::Int8: { +- SharedMem<JS_VOLATILE_ARM int8_t*> src = +- data.cast<JS_VOLATILE_ARM int8_t*>(); ++ SharedMem<int8_t*> src = ++ data.cast<int8_t*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; + } + case Scalar::Uint8: + case Scalar::Uint8Clamped: { +- SharedMem<JS_VOLATILE_ARM uint8_t*> src = +- data.cast<JS_VOLATILE_ARM uint8_t*>(); ++ SharedMem<uint8_t*> src = ++ data.cast<uint8_t*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; + } + case Scalar::Int16: { +- SharedMem<JS_VOLATILE_ARM int16_t*> src = +- data.cast<JS_VOLATILE_ARM int16_t*>(); ++ SharedMem<int16_t*> src = ++ data.cast<int16_t*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; + } + case Scalar::Uint16: { +- SharedMem<JS_VOLATILE_ARM uint16_t*> src = +- data.cast<JS_VOLATILE_ARM uint16_t*>(); ++ SharedMem<uint16_t*> src = ++ data.cast<uint16_t*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; + } + case Scalar::Int32: { +- SharedMem<JS_VOLATILE_ARM int32_t*> src = +- data.cast<JS_VOLATILE_ARM int32_t*>(); ++ SharedMem<int32_t*> src = ++ data.cast<int32_t*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; + } + case Scalar::Uint32: { +- SharedMem<JS_VOLATILE_ARM uint32_t*> src = +- data.cast<JS_VOLATILE_ARM uint32_t*>(); ++ SharedMem<uint32_t*> src = ++ data.cast<uint32_t*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; + } + case Scalar::Float32: { +- SharedMem<JS_VOLATILE_ARM float*> src = +- data.cast<JS_VOLATILE_ARM float*>(); ++ SharedMem<float*> src = ++ data.cast<float*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; + } + case Scalar::Float64: { +- SharedMem<JS_VOLATILE_ARM double*> src = +- data.cast<JS_VOLATILE_ARM double*>(); ++ SharedMem<double*> src = ++ data.cast<double*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; +@@ -329,8 +322,6 @@ class ElementSpecific { + MOZ_CRASH("setFromTypedArray with a typed array with bogus type"); + } + +-#undef JS_VOLATILE_ARM +- + return true; + } + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb index 130ff13ec..7367c30a5 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb @@ -18,6 +18,7 @@ SRC_URI = " \ file://0011-To-fix-build-error-on-arm32BE.patch \ file://0012-JS_PUBLIC_API.patch \ file://0013-riscv-Disable-atomic-operations.patch \ + file://0014-remove-JS_VOLATIME_ARM.patch \ " SRC_URI_append_libc-musl = " \ file://musl/0001-support-musl.patch \ @@ -125,6 +126,8 @@ MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js60-config" do_install_append() { oe_multilib_header mozjs-60/js-config.h + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${bindir}/js60-config } PACKAGES =+ "lib${BPN}" |