diff options
author | Gianfranco Costamagna <costamagna.gianfranco@gmail.com> | 2020-04-09 15:15:43 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-04-09 07:45:55 -0700 |
commit | ea55f0c735c733a28762c0db31f49a87a37dc059 (patch) | |
tree | 7e82805ea6ea334fae706e89cf7720407b1ff869 /meta-oe/dynamic-layers | |
parent | 02fa510149df307bd76889d15dd9f3dba43af232 (diff) | |
download | meta-openembedded-ea55f0c735c733a28762c0db31f49a87a37dc059.tar.gz |
mongodb: Enable again building on 32bit arches from COMPATIBLE_HOST
The upstream pending pull request seems to fix 32bit builds, tested with MACHINE=raspberrypi3
Signed-off-by: Costamagna Gianfranco <costamagnagianfranco@yahoo.it>
Signed-off-by: Costamagna Gianfranco <locutusofborg@debian.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/dynamic-layers')
-rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/1296.patch | 52 | ||||
-rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb | 3 |
2 files changed, 54 insertions, 1 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/1296.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/1296.patch new file mode 100644 index 0000000000..ae84bcb569 --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/1296.patch @@ -0,0 +1,52 @@ +Upstream-Status: submitted https://github.com/mongodb/mongo/pull/1296 +From 362be06fc16a5ad0f9e9aa90cc763c5242e8e35c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Sat, 9 Feb 2019 12:41:45 +0100 +Subject: [PATCH] ssl_manager.cpp: fix build with gcc 7 and -fpermissive + +Change prototype of DERToken::parse function from +parse(ConstDataRange cdr, size_t* outLength); +to parse(ConstDataRange cdr, uint64_t* outLength); + +Otherwise, we got the following error: + +src/mongo/util/net/ssl_manager.cpp: In static member function 'static mongo::StatusWith<mongo::{anonymous}::DERToken> mongo::{anonymous}::DERToken::parse(mongo::ConstDataRange, size_t*)': +src/mongo/util/net/ssl_manager.cpp:575:79: error: invalid conversion from 'size_t* {aka unsigned int*}' to 'long unsigned int*' [-fpermissive] + if (mongoUnsignedAddOverflow64(tagAndLengthByteCount, derLength, outLength) || + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + src/mongo/util/net/ssl_manager.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp +index b93ebe84a4a3..3511eb5d998f 100644 +--- a/src/mongo/util/net/ssl_manager.cpp ++++ b/src/mongo/util/net/ssl_manager.cpp +@@ -782,7 +782,7 @@ class DERToken { + * + * Returns a DERToken which consists of the (tag, length, value) tuple. + */ +- static StatusWith<DERToken> parse(ConstDataRange cdr, size_t* outLength); ++ static StatusWith<DERToken> parse(ConstDataRange cdr, uint64_t* outLength); + + private: + DERType _type{DERType::EndOfContent}; +@@ -799,7 +799,7 @@ struct DataType::Handler<DERToken> { + size_t length, + size_t* advanced, + std::ptrdiff_t debug_offset) { +- size_t outLength; ++ uint64_t outLength; + + auto swPair = DERToken::parse(ConstDataRange(ptr, length), &outLength); + +@@ -844,7 +844,7 @@ StatusWith<std::string> readDERString(ConstDataRangeCursor& cdc) { + } + + +-StatusWith<DERToken> DERToken::parse(ConstDataRange cdr, size_t* outLength) { ++StatusWith<DERToken> DERToken::parse(ConstDataRange cdr, uint64_t* outLength) { + const size_t kTagLength = 1; + const size_t kTagLengthAndInitialLengthByteLength = kTagLength + 1; + diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index 6f460bf762..5c3b806f22 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -23,6 +23,7 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.2 \ file://0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch \ file://0001-Support-deprecated-resolver-functions.patch \ file://0003-Fix-unknown-prefix-env.patch \ + file://1296.patch \ " SRC_URI_append_libc-musl ="\ file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \ @@ -36,7 +37,7 @@ SRC_URI_append_toolchain-clang = "\ S = "${WORKDIR}/git" -COMPATIBLE_HOST ?= '(x86_64|powerpc64|aarch64).*-linux' +COMPATIBLE_HOST ?= '(x86_64|i.86|powerpc64|arm|aarch64).*-linux' PACKAGECONFIG ??= "tcmalloc system-pcre" # gperftools compilation fails for arm below v7 because of missing support of |