diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-08-08 14:47:56 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-13 13:21:01 +0200 |
commit | c3ad7be1cc75ae5419ae4d9cd078e2fc0aaad218 (patch) | |
tree | 807434bb9746de746934e7e94d5509a4430f6226 /meta-oe/recipes-support/mongodb | |
parent | eae0e5719cdc90ab244fc490ff16a9726d2e40bf (diff) | |
download | meta-openembedded-c3ad7be1cc75ae5419ae4d9cd078e2fc0aaad218.tar.gz |
mongodb: Upgrade to 3.4.6
Add missing Zlib to license list
Add patches to fix build issue with gcc7 and missing internal build dependency
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/mongodb')
3 files changed, 107 insertions, 5 deletions
diff --git a/meta-oe/recipes-support/mongodb/mongodb/0001-mongo-Add-using-std-string.patch b/meta-oe/recipes-support/mongodb/mongodb/0001-mongo-Add-using-std-string.patch new file mode 100644 index 000000000..e517d53d1 --- /dev/null +++ b/meta-oe/recipes-support/mongodb/mongodb/0001-mongo-Add-using-std-string.patch | |||
@@ -0,0 +1,72 @@ | |||
1 | From 5fdec9592285f5976345fbccb3d07fae1245ab53 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 2 Aug 2017 15:41:22 -0700 | ||
4 | Subject: [PATCH] mongo: Add using std::string | ||
5 | |||
6 | This is needed with latest clang | ||
7 | Fixes | ||
8 | src/mongo/db/dbwebserver.cpp:206:23: error: use of undeclared identifier 'string'; did you mean 'String'? | ||
9 | static vector<string> commands; | ||
10 | ^~~~~~ | ||
11 | String | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | src/mongo/db/dbwebserver.cpp | 1 + | ||
16 | src/mongo/db/matcher/expression_leaf.cpp | 2 ++ | ||
17 | src/mongo/db/repl/master_slave.cpp | 1 + | ||
18 | src/mongo/util/net/miniwebserver.cpp | 1 + | ||
19 | 4 files changed, 5 insertions(+) | ||
20 | |||
21 | diff --git a/src/mongo/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp | ||
22 | index b202e0500b..0255613524 100644 | ||
23 | --- a/src/mongo/db/dbwebserver.cpp | ||
24 | +++ b/src/mongo/db/dbwebserver.cpp | ||
25 | @@ -67,6 +67,7 @@ namespace mongo { | ||
26 | using std::map; | ||
27 | using std::stringstream; | ||
28 | using std::vector; | ||
29 | +using std::string; | ||
30 | |||
31 | using namespace html; | ||
32 | |||
33 | diff --git a/src/mongo/db/matcher/expression_leaf.cpp b/src/mongo/db/matcher/expression_leaf.cpp | ||
34 | index d562bff141..4d931985e2 100644 | ||
35 | --- a/src/mongo/db/matcher/expression_leaf.cpp | ||
36 | +++ b/src/mongo/db/matcher/expression_leaf.cpp | ||
37 | @@ -44,6 +44,8 @@ | ||
38 | #include "mongo/stdx/memory.h" | ||
39 | #include "mongo/util/mongoutils/str.h" | ||
40 | |||
41 | +using std::string; | ||
42 | + | ||
43 | namespace mongo { | ||
44 | |||
45 | Status LeafMatchExpression::setPath(StringData path) { | ||
46 | diff --git a/src/mongo/db/repl/master_slave.cpp b/src/mongo/db/repl/master_slave.cpp | ||
47 | index 05faad1259..ea25d7151b 100644 | ||
48 | --- a/src/mongo/db/repl/master_slave.cpp | ||
49 | +++ b/src/mongo/db/repl/master_slave.cpp | ||
50 | @@ -78,6 +78,7 @@ using std::endl; | ||
51 | using std::max; | ||
52 | using std::min; | ||
53 | using std::set; | ||
54 | +using std::string; | ||
55 | using std::stringstream; | ||
56 | using std::unique_ptr; | ||
57 | using std::vector; | ||
58 | diff --git a/src/mongo/util/net/miniwebserver.cpp b/src/mongo/util/net/miniwebserver.cpp | ||
59 | index 5f4165d42f..239720c349 100644 | ||
60 | --- a/src/mongo/util/net/miniwebserver.cpp | ||
61 | +++ b/src/mongo/util/net/miniwebserver.cpp | ||
62 | @@ -46,6 +46,7 @@ namespace mongo { | ||
63 | |||
64 | using std::shared_ptr; | ||
65 | using std::stringstream; | ||
66 | +using std::string; | ||
67 | using std::vector; | ||
68 | |||
69 | MiniWebServer::MiniWebServer(const string& name, const string& ip, int port, ServiceContext* ctx) | ||
70 | -- | ||
71 | 2.13.3 | ||
72 | |||
diff --git a/meta-oe/recipes-support/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch b/meta-oe/recipes-support/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch new file mode 100644 index 000000000..95f9c1c1c --- /dev/null +++ b/meta-oe/recipes-support/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 5759878e5d278f11a1063e8fccd1e6b7b54caadf Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 2 Aug 2017 16:25:37 -0700 | ||
4 | Subject: [PATCH 2/2] d_state.cpp: Add missing dependenncy on | ||
5 | local_sharding_info | ||
6 | |||
7 | Fixes | ||
8 | | src/mongo/s/d_state.cpp:81: error: undefined reference to 'mongo::enableLocalShardingInfo(mongo::ServiceContext*, std::function<bool (mongo::OperationContext*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>)' | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | src/mongo/s/SConscript | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript | ||
16 | index 71720be517..51bd199127 100644 | ||
17 | --- a/src/mongo/s/SConscript | ||
18 | +++ b/src/mongo/s/SConscript | ||
19 | @@ -317,5 +317,6 @@ env.Library( | ||
20 | "$BUILD_DIR/mongo/db/s/sharding", | ||
21 | "$BUILD_DIR/mongo/executor/network_interface_factory", | ||
22 | "$BUILD_DIR/mongo/s/client/shard_local", | ||
23 | + "$BUILD_DIR/mongo/s/local_sharding_info", | ||
24 | ], | ||
25 | ) | ||
26 | -- | ||
27 | 2.13.3 | ||
28 | |||
diff --git a/meta-oe/recipes-support/mongodb/mongodb_git.bb b/meta-oe/recipes-support/mongodb/mongodb_git.bb index f1a65550e..b38641cff 100644 --- a/meta-oe/recipes-support/mongodb/mongodb_git.bb +++ b/meta-oe/recipes-support/mongodb/mongodb_git.bb | |||
@@ -1,16 +1,18 @@ | |||
1 | SUMMARY = "mongodb" | 1 | SUMMARY = "mongodb" |
2 | LICENSE = "AGPL-3.0 & Apache-2.0" | 2 | LICENSE = "AGPL-3.0 & Apache-2.0 & Zlib" |
3 | LIC_FILES_CHKSUM = "file://GNU-AGPL-3.0.txt;md5=73f1eb20517c55bf9493b7dd6e480788 \ | 3 | LIC_FILES_CHKSUM = "file://GNU-AGPL-3.0.txt;md5=73f1eb20517c55bf9493b7dd6e480788 \ |
4 | file://APACHE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" | 4 | file://APACHE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" |
5 | 5 | ||
6 | DEPENDS = "openssl libpcre libpcap zlib" | 6 | DEPENDS = "openssl libpcre libpcap zlib python boost" |
7 | 7 | ||
8 | inherit scons | 8 | inherit scons |
9 | 9 | ||
10 | PV = "3.3.0+git${SRCPV}" | 10 | PV = "3.4.6+git${SRCPV}" |
11 | SRCREV = "aacd231be0626a204cb40908afdf62c4b67bb0ad" | 11 | SRCREV = "c55eb86ef46ee7aede3b1e2a5d184a7df4bfb5b5" |
12 | SRC_URI = "git://github.com/mongodb/mongo.git;branch=master \ | 12 | SRC_URI = "git://github.com/mongodb/mongo.git;branch=v3.4 \ |
13 | file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ | 13 | file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ |
14 | file://0001-mongo-Add-using-std-string.patch \ | ||
15 | file://0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch \ | ||
14 | " | 16 | " |
15 | 17 | ||
16 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |