Bump buildroot to 2019.02
This commit is contained in:
@@ -0,0 +1,55 @@
|
||||
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>
|
||||
[Upstream status: https://github.com/mongodb/mongo/pull/1296]
|
||||
---
|
||||
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 b93ebe84a4..3511eb5d99 100644
|
||||
--- a/src/mongo/util/net/ssl_manager.cpp
|
||||
+++ b/src/mongo/util/net/ssl_manager.cpp
|
||||
@@ -782,7 +782,7 @@ public:
|
||||
*
|
||||
* 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;
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# from src/mongo/platform/bits.h
|
||||
# from https://docs.mongodb.com/manual/installation/#supported-platforms
|
||||
config BR2_PACKAGE_MONGODB_ARCH_SUPPORTS
|
||||
bool
|
||||
# ARM needs LDREX/STREX, so ARMv6+
|
||||
default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5
|
||||
default y if BR2_aarch64 || BR2_i386 || BR2_powerpc64 || BR2_x86_64
|
||||
default y if BR2_aarch64 || BR2_powerpc64 || BR2_x86_64
|
||||
|
||||
config BR2_PACKAGE_MONGODB
|
||||
bool "mongodb"
|
||||
@@ -12,7 +12,17 @@ config BR2_PACKAGE_MONGODB
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6
|
||||
select BR2_PACKAGE_BOOST
|
||||
select BR2_PACKAGE_BOOST_FILESYSTEM
|
||||
select BR2_PACKAGE_BOOST_IOSTREAMS
|
||||
select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
select BR2_PACKAGE_PCRE
|
||||
select BR2_PACKAGE_SNAPPY
|
||||
select BR2_PACKAGE_SQLITE
|
||||
select BR2_PACKAGE_YAML_CPP
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
MongoDB is a cross-platform document-oriented database
|
||||
(NoSQL).
|
||||
@@ -23,8 +33,8 @@ config BR2_PACKAGE_MONGODB
|
||||
|
||||
https://www.mongodb.org/
|
||||
|
||||
comment "mongodb needs a glibc toolchain w/ wchar, threads, C++, gcc >= 4.8"
|
||||
comment "mongodb needs a glibc toolchain w/ wchar, threads, C++, gcc >= 6"
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_6
|
||||
depends on BR2_PACKAGE_MONGODB_ARCH_SUPPORTS
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
# Locally computed:
|
||||
sha256 4764945631bca4ac5c2b239e04e91db00e39716915204349170c37cb7897c564 mongodb-r3.3.4.tar.gz
|
||||
sha256 5db85f06b2a0b2ae393339a4aed1366928aaef2b46c7c32826fa87c3217dc6f7 mongodb-r4.0.6.tar.gz
|
||||
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt
|
||||
sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt
|
||||
|
||||
@@ -4,21 +4,38 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MONGODB_VERSION_BASE = 3.3.4
|
||||
MONGODB_VERSION_BASE = 4.0.6
|
||||
MONGODB_VERSION = r$(MONGODB_VERSION_BASE)
|
||||
MONGODB_SITE = $(call github,mongodb,mongo,$(MONGODB_VERSION))
|
||||
|
||||
MONGODB_LICENSE = AGPL-3.0, Apache-2.0
|
||||
MONGODB_LICENSE_FILES = GNU-AGPL-3.0.txt APACHE-2.0.txt
|
||||
MONGODB_LICENSE = Apache-2.0 (drivers), SSPL (database)
|
||||
MONGODB_LICENSE_FILES = APACHE-2.0.txt LICENSE-Community.txt
|
||||
|
||||
MONGODB_DEPENDENCIES = host-scons
|
||||
MONGODB_DEPENDENCIES = \
|
||||
boost \
|
||||
host-python-cheetah \
|
||||
host-python-pyyaml \
|
||||
host-python-typing \
|
||||
host-scons \
|
||||
pcre \
|
||||
snappy \
|
||||
sqlite \
|
||||
yaml-cpp \
|
||||
zlib
|
||||
|
||||
MONGODB_SCONS_TARGETS = mongod mongos
|
||||
|
||||
MONGODB_SCONS_ENV = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \
|
||||
-j"$(PARALLEL_JOBS)"
|
||||
|
||||
MONGODB_SCONS_OPTS = --disable-warnings-as-errors
|
||||
MONGODB_SCONS_OPTS = \
|
||||
--disable-warnings-as-errors \
|
||||
--use-system-boost \
|
||||
--use-system-pcre \
|
||||
--use-system-snappy \
|
||||
--use-system-sqlite \
|
||||
--use-system-yaml \
|
||||
--use-system-zlib
|
||||
|
||||
# need to pass mongo version when not building from git repo
|
||||
MONGODB_SCONS_OPTS += MONGO_VERSION=$(MONGODB_VERSION_BASE)-
|
||||
@@ -41,9 +58,18 @@ else
|
||||
MONGODB_SCONS_OPTS += --js-engine=none --allocator=system
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCURL),y)
|
||||
MONGODB_DEPENDENCIES += libcurl
|
||||
MONGODB_SCONS_OPTS += --enable-free-mon=on
|
||||
else
|
||||
MONGODB_SCONS_OPTS += --enable-free-mon=off
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
MONGODB_DEPENDENCIES += openssl
|
||||
MONGODB_SCONS_OPTS += --ssl=SSL
|
||||
MONGODB_SCONS_OPTS += \
|
||||
--ssl \
|
||||
--ssl-provider=openssl
|
||||
endif
|
||||
|
||||
define MONGODB_BUILD_CMDS
|
||||
|
||||
Reference in New Issue
Block a user