diff options
13 files changed, 196 insertions, 131 deletions
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch index 4d7ac3aa5..e636adc55 100644 --- a/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From fbfceebce2121831904f2f7115252dd03b413a6d Mon Sep 17 00:00:00 2001 | 1 | From 97914aeab52b4d0ea0ab9e5ff985a1c5cddb0fa1 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Vincent Prince <vincent.prince.fr@gmail.com> |
3 | Date: Tue, 19 Sep 2017 18:52:53 -0700 | 3 | Date: Mon, 16 Sep 2019 13:41:39 +0200 |
4 | Subject: [PATCH] IntelRDFPMathLib20U1: Check for __DEFINED_wchar_t | 4 | Subject: [PATCH 06/10] IntelRDFPMathLib20U1: Check for __DEFINED_wchar_t |
5 | 5 | ||
6 | This is defined by musl if wchar_t is already defined | 6 | This is defined by musl if wchar_t is already defined |
7 | 7 | ||
@@ -12,16 +12,15 @@ src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h:46:15: error: t | |||
12 | typedef int wchar_t; | 12 | typedef int wchar_t; |
13 | 13 | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
15 | Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com> | ||
15 | --- | 16 | --- |
16 | Upstream-Status: Pending | ||
17 | |||
18 | src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h | 2 +- | 17 | src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h | 2 +- |
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
20 | 19 | ||
21 | Index: git/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h | 20 | diff --git a/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h b/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h |
22 | =================================================================== | 21 | index 56775bc..be96a85 100755 |
23 | --- git.orig/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h | 22 | --- a/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h |
24 | +++ git/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h | 23 | +++ b/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h |
25 | @@ -43,7 +43,7 @@ | 24 | @@ -43,7 +43,7 @@ |
26 | 25 | ||
27 | #if 0 // MongoDB Modification -- just `#include <stddef.h>` | 26 | #if 0 // MongoDB Modification -- just `#include <stddef.h>` |
@@ -31,3 +30,6 @@ Index: git/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h | |||
31 | typedef int wchar_t; | 30 | typedef int wchar_t; |
32 | #endif | 31 | #endif |
33 | #else | 32 | #else |
33 | -- | ||
34 | 2.7.4 | ||
35 | |||
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch index 070411ab9..3d949c873 100644 --- a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 5994023a03634dfc0318976c293e7391fe6aa060 Mon Sep 17 00:00:00 2001 | 1 | From 8d035e84c2edb44461ef4df9cdef0a6dfce0a1d7 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 24 Aug 2018 12:56:22 -0700 | 3 | Date: Fri, 24 Aug 2018 12:56:22 -0700 |
4 | Subject: [PATCH 1/2] Support deprecated resolver functions | 4 | Subject: [PATCH 07/10] Support deprecated resolver functions |
5 | 5 | ||
6 | Needed for musl libc | 6 | Needed for musl libc |
7 | 7 | ||
@@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | 1 file changed, 6 insertions(+) | 12 | 1 file changed, 6 insertions(+) |
13 | 13 | ||
14 | diff --git a/src/mongo/util/dns_query_posix-impl.h b/src/mongo/util/dns_query_posix-impl.h | 14 | diff --git a/src/mongo/util/dns_query_posix-impl.h b/src/mongo/util/dns_query_posix-impl.h |
15 | index d19958010c..bbca3309ed 100644 | 15 | index a5e3629..fb29d2d 100644 |
16 | --- a/src/mongo/util/dns_query_posix-impl.h | 16 | --- a/src/mongo/util/dns_query_posix-impl.h |
17 | +++ b/src/mongo/util/dns_query_posix-impl.h | 17 | +++ b/src/mongo/util/dns_query_posix-impl.h |
18 | @@ -53,6 +53,12 @@ | 18 | @@ -54,6 +54,12 @@ |
19 | 19 | ||
20 | #include <boost/noncopyable.hpp> | 20 | #include <boost/noncopyable.hpp> |
21 | 21 | ||
@@ -29,5 +29,5 @@ index d19958010c..bbca3309ed 100644 | |||
29 | namespace dns { | 29 | namespace dns { |
30 | // The anonymous namespace is safe, in this header, as it is not really a header. It is only used | 30 | // The anonymous namespace is safe, in this header, as it is not really a header. It is only used |
31 | -- | 31 | -- |
32 | 2.18.0 | 32 | 2.7.4 |
33 | 33 | ||
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch index a6d721ac5..190884624 100644 --- a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch | |||
@@ -1,19 +1,20 @@ | |||
1 | From 53368d3f4adc09dd84234a9af31771bcd8ca2757 Mon Sep 17 00:00:00 2001 | 1 | From 1b2e24e14ee72e54e466be2512c78272f62d60b4 Mon Sep 17 00:00:00 2001 |
2 | From: Sven Ebenfeld <sven.ebenfeld@gmail.com> | 2 | From: Vincent Prince <vincent.prince.fr@gmail.com> |
3 | Date: Fri, 15 Jan 2016 22:41:28 +0100 | 3 | Date: Mon, 16 Sep 2019 13:21:44 +0200 |
4 | Subject: [PATCH] Tell scons to use build settings from environment variables | 4 | Subject: [PATCH 01/10] Tell scons to use build settings from environment |
5 | variables | ||
5 | 6 | ||
6 | Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com> | 7 | Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com> |
8 | Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com> | ||
7 | --- | 9 | --- |
8 | SConstruct | 8 ++++++-- | 10 | SConstruct | 8 ++++++-- |
9 | src/mongo/util/SConscript | 2 ++ | 11 | 1 files changed, 8 insertions(+), 2 deletions(-) |
10 | 2 files changed, 8 insertions(+), 2 deletions(-) | ||
11 | 12 | ||
12 | Index: git/SConstruct | 13 | diff --git a/SConstruct b/SConstruct |
13 | =================================================================== | 14 | index 7ebbcbc..e63cf15 100644 |
14 | --- git.orig/SConstruct | 15 | --- a/SConstruct |
15 | +++ git/SConstruct | 16 | +++ b/SConstruct |
16 | @@ -564,6 +564,7 @@ def variable_arch_converter(val): | 17 | @@ -608,6 +608,7 @@ def variable_arch_converter(val): |
17 | 'amd64': 'x86_64', | 18 | 'amd64': 'x86_64', |
18 | 'emt64': 'x86_64', | 19 | 'emt64': 'x86_64', |
19 | 'x86': 'i386', | 20 | 'x86': 'i386', |
@@ -21,7 +22,7 @@ Index: git/SConstruct | |||
21 | } | 22 | } |
22 | val = val.lower() | 23 | val = val.lower() |
23 | 24 | ||
24 | @@ -652,7 +653,8 @@ env_vars.Add( | 25 | @@ -695,7 +696,8 @@ env_vars.Add( |
25 | ) | 26 | ) |
26 | 27 | ||
27 | env_vars.Add('CC', | 28 | env_vars.Add('CC', |
@@ -31,7 +32,7 @@ Index: git/SConstruct | |||
31 | 32 | ||
32 | env_vars.Add('CCFLAGS', | 33 | env_vars.Add('CCFLAGS', |
33 | help='Sets flags for the C and C++ compiler', | 34 | help='Sets flags for the C and C++ compiler', |
34 | @@ -672,7 +674,8 @@ env_vars.Add('CPPPATH', | 35 | @@ -715,7 +717,8 @@ env_vars.Add('CPPPATH', |
35 | converter=variable_shlex_converter) | 36 | converter=variable_shlex_converter) |
36 | 37 | ||
37 | env_vars.Add('CXX', | 38 | env_vars.Add('CXX', |
@@ -41,24 +42,15 @@ Index: git/SConstruct | |||
41 | 42 | ||
42 | env_vars.Add('CXXFLAGS', | 43 | env_vars.Add('CXXFLAGS', |
43 | help='Sets flags for the C++ compiler', | 44 | help='Sets flags for the C++ compiler', |
44 | @@ -961,6 +964,7 @@ envDict = dict(BUILD_ROOT=buildDir, | 45 | @@ -1018,6 +1021,7 @@ envDict = dict(BUILD_ROOT=buildDir, |
45 | ) | 46 | ) |
46 | 47 | ||
47 | env = Environment(variables=env_vars, **envDict) | 48 | env = Environment(variables=env_vars, **envDict) |
48 | +env.PrependENVPath('PATH', os.getenv('PATH')) | 49 | +env.PrependENVPath('PATH', os.getenv('PATH')) |
49 | del envDict | 50 | del envDict |
50 | 51 | ||
51 | env.AddMethod(mongo_platform.env_os_is_wrapper, 'TargetOSIs') | 52 | for var in ['CC', 'CXX']: |
52 | Index: git/src/mongo/util/SConscript | ||
53 | =================================================================== | ||
54 | --- git.orig/src/mongo/util/SConscript | ||
55 | +++ git/src/mongo/util/SConscript | ||
56 | @@ -329,6 +329,8 @@ if env['MONGO_ALLOCATOR'] == 'tcmalloc': | ||
57 | 'MONGO_HAVE_GPERFTOOLS_SIZE_CLASS_STATS' | ||
58 | ] | ||
59 | ) | ||
60 | + if not use_system_version_of_library('valgrind'): | ||
61 | + tcmspEnv.InjectThirdPartyIncludePaths('valgrind') | ||
62 | 53 | ||
63 | if not use_system_version_of_library('valgrind'): | 54 | -- |
64 | # Include valgrind since tcmalloc disables itself while running under valgrind | 55 | 2.7.4 |
56 | |||
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch index c17ebf1e7..d98fa56cb 100644 --- a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch | |||
@@ -1,18 +1,18 @@ | |||
1 | From 3eed8388b49d5d3cbc2db74fee1b017eb4b40d0a Mon Sep 17 00:00:00 2001 | 1 | From d701ceeb15662038435b80ba556a80c17f76d2dc Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Vincent Prince <vincent.prince.fr@gmail.com> |
3 | Date: Sat, 2 Sep 2017 10:06:24 -0700 | 3 | Date: Mon, 16 Sep 2019 13:30:13 +0200 |
4 | Subject: [PATCH] Use __GLIBC__ to control use of gnu_get_libc_version | 4 | Subject: [PATCH 03/10] Use __GLIBC__ to control use of gnu_get_libc_version |
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com> | ||
7 | --- | 8 | --- |
8 | Upstream-Status: Pending | 9 | src/mongo/util/processinfo_linux.cpp | 8 ++++---- |
9 | src/mongo/util/processinfo_linux.cpp | 6 ++++-- | 10 | 1 file changed, 4 insertions(+), 4 deletions(-) |
10 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
11 | 11 | ||
12 | Index: git/src/mongo/util/processinfo_linux.cpp | 12 | diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp |
13 | =================================================================== | 13 | index cccb91c..45c4b7d 100644 |
14 | --- git.orig/src/mongo/util/processinfo_linux.cpp | 14 | --- a/src/mongo/util/processinfo_linux.cpp |
15 | +++ git/src/mongo/util/processinfo_linux.cpp | 15 | +++ b/src/mongo/util/processinfo_linux.cpp |
16 | @@ -44,10 +44,10 @@ | 16 | @@ -44,10 +44,10 @@ |
17 | #include <unistd.h> | 17 | #include <unistd.h> |
18 | #ifdef __BIONIC__ | 18 | #ifdef __BIONIC__ |
@@ -27,8 +27,8 @@ Index: git/src/mongo/util/processinfo_linux.cpp | |||
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | #include <boost/filesystem.hpp> | 29 | #include <boost/filesystem.hpp> |
30 | @@ -503,7 +503,7 @@ void ProcessInfo::SystemInfo::collectSys | 30 | @@ -546,7 +546,7 @@ void ProcessInfo::SystemInfo::collectSystemInfo() { |
31 | stringstream ss; | 31 | std::stringstream ss; |
32 | ss << "uClibc-" << __UCLIBC_MAJOR__ << "." << __UCLIBC_MINOR__ << "." << __UCLIBC_SUBLEVEL__; | 32 | ss << "uClibc-" << __UCLIBC_MAJOR__ << "." << __UCLIBC_MINOR__ << "." << __UCLIBC_SUBLEVEL__; |
33 | bExtra.append("libcVersion", ss.str()); | 33 | bExtra.append("libcVersion", ss.str()); |
34 | -#else | 34 | -#else |
@@ -36,3 +36,6 @@ Index: git/src/mongo/util/processinfo_linux.cpp | |||
36 | bExtra.append("libcVersion", gnu_get_libc_version()); | 36 | bExtra.append("libcVersion", gnu_get_libc_version()); |
37 | #endif | 37 | #endif |
38 | if (!verSig.empty()) | 38 | if (!verSig.empty()) |
39 | -- | ||
40 | 2.7.4 | ||
41 | |||
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch index 99edad3c4..b9c670407 100644 --- a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a4951489d649c2b609cbb80f6cfb49fdcad8bd43 Mon Sep 17 00:00:00 2001 | 1 | From 20fcbf2a05ee6542aba942f6006d149db70fb9ce Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 2 Sep 2017 10:03:37 -0700 | 3 | Date: Sat, 2 Sep 2017 10:03:37 -0700 |
4 | Subject: [PATCH] Use long long instead of int64_t | 4 | Subject: [PATCH 02/10] Use long long instead of int64_t |
5 | 5 | ||
6 | Fixes | 6 | Fixes |
7 | error: call to member function 'appendNumber' is ambiguous | 7 | error: call to member function 'appendNumber' is ambiguous |
@@ -9,15 +9,14 @@ since this function expects long long as parameter and not int64_t | |||
9 | 9 | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
11 | --- | 11 | --- |
12 | Upstream-Status: Pending | ||
13 | src/mongo/util/procparser.cpp | 10 +++++----- | 12 | src/mongo/util/procparser.cpp | 10 +++++----- |
14 | 1 file changed, 5 insertions(+), 5 deletions(-) | 13 | 1 file changed, 5 insertions(+), 5 deletions(-) |
15 | 14 | ||
16 | Index: git/src/mongo/util/procparser.cpp | 15 | diff --git a/src/mongo/util/procparser.cpp b/src/mongo/util/procparser.cpp |
17 | =================================================================== | 16 | index c574a3f..5ea66b7 100644 |
18 | --- git.orig/src/mongo/util/procparser.cpp | 17 | --- a/src/mongo/util/procparser.cpp |
19 | +++ git/src/mongo/util/procparser.cpp | 18 | +++ b/src/mongo/util/procparser.cpp |
20 | @@ -260,7 +260,7 @@ Status parseProcStat(const std::vector<S | 19 | @@ -261,7 +261,7 @@ Status parseProcStat(const std::vector<StringData>& keys, |
21 | 20 | ||
22 | StringData stringValue((*partIt).begin(), (*partIt).end() - (*partIt).begin()); | 21 | StringData stringValue((*partIt).begin(), (*partIt).end() - (*partIt).begin()); |
23 | 22 | ||
@@ -26,7 +25,7 @@ Index: git/src/mongo/util/procparser.cpp | |||
26 | 25 | ||
27 | if (!parseNumberFromString(stringValue, &value).isOK()) { | 26 | if (!parseNumberFromString(stringValue, &value).isOK()) { |
28 | value = 0; | 27 | value = 0; |
29 | @@ -272,7 +272,7 @@ Status parseProcStat(const std::vector<S | 28 | @@ -273,7 +273,7 @@ Status parseProcStat(const std::vector<StringData>& keys, |
30 | } else { | 29 | } else { |
31 | StringData stringValue((*partIt).begin(), (*partIt).end() - (*partIt).begin()); | 30 | StringData stringValue((*partIt).begin(), (*partIt).end() - (*partIt).begin()); |
32 | 31 | ||
@@ -35,7 +34,7 @@ Index: git/src/mongo/util/procparser.cpp | |||
35 | 34 | ||
36 | if (!parseNumberFromString(stringValue, &value).isOK()) { | 35 | if (!parseNumberFromString(stringValue, &value).isOK()) { |
37 | value = 0; | 36 | value = 0; |
38 | @@ -365,7 +365,7 @@ Status parseProcMemInfo(const std::vecto | 37 | @@ -366,7 +366,7 @@ Status parseProcMemInfo(const std::vector<StringData>& keys, |
39 | 38 | ||
40 | StringData stringValue((*partIt).begin(), (*partIt).end()); | 39 | StringData stringValue((*partIt).begin(), (*partIt).end()); |
41 | 40 | ||
@@ -44,7 +43,7 @@ Index: git/src/mongo/util/procparser.cpp | |||
44 | 43 | ||
45 | if (!parseNumberFromString(stringValue, &value).isOK()) { | 44 | if (!parseNumberFromString(stringValue, &value).isOK()) { |
46 | value = 0; | 45 | value = 0; |
47 | @@ -522,7 +522,7 @@ Status parseProcDiskStats(const std::vec | 46 | @@ -522,7 +522,7 @@ Status parseProcDiskStats(const std::vector<StringData>& disks, |
48 | StringData data, | 47 | StringData data, |
49 | BSONObjBuilder* builder) { | 48 | BSONObjBuilder* builder) { |
50 | bool foundKeys = false; | 49 | bool foundKeys = false; |
@@ -53,7 +52,7 @@ Index: git/src/mongo/util/procparser.cpp | |||
53 | stats.reserve(kDiskFieldCount); | 52 | stats.reserve(kDiskFieldCount); |
54 | 53 | ||
55 | using string_split_iterator = boost::split_iterator<StringData::const_iterator>; | 54 | using string_split_iterator = boost::split_iterator<StringData::const_iterator>; |
56 | @@ -597,7 +597,7 @@ Status parseProcDiskStats(const std::vec | 55 | @@ -597,7 +597,7 @@ Status parseProcDiskStats(const std::vector<StringData>& disks, |
57 | 56 | ||
58 | StringData stringValue((*partIt).begin(), (*partIt).end()); | 57 | StringData stringValue((*partIt).begin(), (*partIt).end()); |
59 | 58 | ||
@@ -62,3 +61,6 @@ Index: git/src/mongo/util/procparser.cpp | |||
62 | 61 | ||
63 | if (!parseNumberFromString(stringValue, &value).isOK()) { | 62 | if (!parseNumberFromString(stringValue, &value).isOK()) { |
64 | value = 0; | 63 | value = 0; |
64 | -- | ||
65 | 2.7.4 | ||
66 | |||
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch index b597422e4..e726933f5 100644 --- a/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch | |||
@@ -1,28 +1,29 @@ | |||
1 | From 31ca5c563f1d9a3f70258be3dd2b1e547a65a550 Mon Sep 17 00:00:00 2001 | 1 | From 097e8a66930cfa28ac8bfa35f62d0a9ee3b74488 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Vincent Prince <vincent.prince.fr@gmail.com> |
3 | Date: Tue, 5 Feb 2019 00:21:12 -0800 | 3 | Date: Mon, 16 Sep 2019 13:46:52 +0200 |
4 | Subject: [PATCH] asio: Dont use experimental with clang | 4 | Subject: [PATCH 10/10] asio: Dont use experimental with clang |
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com> | ||
7 | --- | 8 | --- |
8 | .../asio-master/asio/include/asio/detail/string_view.hpp | 4 ++-- | 9 | src/third_party/asio-master/asio/include/asio/detail/string_view.hpp | 4 ++-- |
9 | 1 file changed, 2 insertions(+), 2 deletions(-) | 10 | 1 file changed, 2 insertions(+), 2 deletions(-) |
10 | 11 | ||
11 | diff --git a/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp b/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp | 12 | diff --git a/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp b/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp |
12 | index 222c02186d..3bf7494529 100644 | 13 | index f09cebc..fa307b5 100644 |
13 | --- a/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp | 14 | --- a/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp |
14 | +++ b/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp | 15 | +++ b/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp |
15 | @@ -28,8 +28,8 @@ | 16 | @@ -33,8 +33,8 @@ namespace asio { |
16 | namespace asio { | 17 | using std::basic_string_view; |
17 | 18 | using std::string_view; | |
18 | #if defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW) | 19 | #elif defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW) |
19 | -using std::experimental::basic_string_view; | 20 | -using std::experimental::basic_string_view; |
20 | -using std::experimental::string_view; | 21 | -using std::experimental::string_view; |
21 | +using std::basic_string_view; | 22 | +using std::basic_string_view; |
22 | +using std::string_view; | 23 | +using std::string_view; |
23 | #else // defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW) | 24 | #endif // defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW) |
24 | using std::basic_string_view; | 25 | |
25 | using std::string_view; | 26 | } // namespace asio |
26 | -- | 27 | -- |
27 | 2.20.1 | 28 | 2.7.4 |
28 | 29 | ||
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch index 098306f50..869d2849d 100644 --- a/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From df7ef16afcc6ab55daa686e4f15c16e3d1280337 Mon Sep 17 00:00:00 2001 | 1 | From 73c6374ceb0c062e91210cc9ef3e0e9fa30ee514 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 2 Sep 2017 12:42:30 -0700 | 3 | Date: Sat, 2 Sep 2017 12:42:30 -0700 |
4 | Subject: [PATCH 2/4] Add a definition for the macro __ELF_NATIVE_CLASS | 4 | Subject: [PATCH 04/10] Add a definition for the macro __ELF_NATIVE_CLASS |
5 | 5 | ||
6 | It depends on the native arch's word size. | 6 | It depends on the native arch's word size. |
7 | 7 | ||
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
11 | 1 file changed, 9 insertions(+) | 11 | 1 file changed, 9 insertions(+) |
12 | 12 | ||
13 | diff --git a/src/mongo/util/stacktrace_posix.cpp b/src/mongo/util/stacktrace_posix.cpp | 13 | diff --git a/src/mongo/util/stacktrace_posix.cpp b/src/mongo/util/stacktrace_posix.cpp |
14 | index 53ab85f56f..7c458e7ef2 100644 | 14 | index 1d7b3d7..f81e329 100644 |
15 | --- a/src/mongo/util/stacktrace_posix.cpp | 15 | --- a/src/mongo/util/stacktrace_posix.cpp |
16 | +++ b/src/mongo/util/stacktrace_posix.cpp | 16 | +++ b/src/mongo/util/stacktrace_posix.cpp |
17 | @@ -37,6 +37,15 @@ | 17 | @@ -39,6 +39,15 @@ |
18 | #include <string> | 18 | #include <string> |
19 | #include <sys/utsname.h> | 19 | #include <sys/utsname.h> |
20 | 20 | ||
@@ -31,5 +31,5 @@ index 53ab85f56f..7c458e7ef2 100644 | |||
31 | #include "mongo/config.h" | 31 | #include "mongo/config.h" |
32 | #include "mongo/db/jsobj.h" | 32 | #include "mongo/db/jsobj.h" |
33 | -- | 33 | -- |
34 | 2.14.1 | 34 | 2.7.4 |
35 | 35 | ||
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch index 085fa50d9..59066b260 100644 --- a/meta-oe/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 98543889f7ba38c02eb7cd9822f45e27d619edd6 Mon Sep 17 00:00:00 2001 | 1 | From ffe6045b190b735601cd209d3e7ac121604c5a4e Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 24 Aug 2018 13:07:01 -0700 | 3 | Date: Fri, 24 Aug 2018 13:07:01 -0700 |
4 | Subject: [PATCH 2/2] Fix default stack size to 256K | 4 | Subject: [PATCH 08/10] Fix default stack size to 256K |
5 | 5 | ||
6 | On musl default stack size is ~80K which is too low | 6 | On musl default stack size is ~80K which is too low |
7 | for mongodb | 7 | for mongodb |
@@ -10,14 +10,14 @@ Upstream-Status: Pending | |||
10 | 10 | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | --- | 12 | --- |
13 | .../platform/stack_locator_pthread_getattr_np.cpp | 10 ++++++++++ | 13 | src/mongo/platform/stack_locator_pthread_getattr_np.cpp | 10 ++++++++++ |
14 | 1 file changed, 10 insertions(+) | 14 | 1 file changed, 10 insertions(+) |
15 | 15 | ||
16 | diff --git a/src/mongo/platform/stack_locator_pthread_getattr_np.cpp b/src/mongo/platform/stack_locator_pthread_getattr_np.cpp | 16 | diff --git a/src/mongo/platform/stack_locator_pthread_getattr_np.cpp b/src/mongo/platform/stack_locator_pthread_getattr_np.cpp |
17 | index 648d26a41c..6e398f00c9 100644 | 17 | index 4f3044c..68e47e3 100644 |
18 | --- a/src/mongo/platform/stack_locator_pthread_getattr_np.cpp | 18 | --- a/src/mongo/platform/stack_locator_pthread_getattr_np.cpp |
19 | +++ b/src/mongo/platform/stack_locator_pthread_getattr_np.cpp | 19 | +++ b/src/mongo/platform/stack_locator_pthread_getattr_np.cpp |
20 | @@ -35,6 +35,16 @@ | 20 | @@ -36,6 +36,16 @@ |
21 | #include "mongo/util/assert_util.h" | 21 | #include "mongo/util/assert_util.h" |
22 | #include "mongo/util/scopeguard.h" | 22 | #include "mongo/util/scopeguard.h" |
23 | 23 | ||
@@ -35,5 +35,5 @@ index 648d26a41c..6e398f00c9 100644 | |||
35 | 35 | ||
36 | StackLocator::StackLocator() { | 36 | StackLocator::StackLocator() { |
37 | -- | 37 | -- |
38 | 2.18.0 | 38 | 2.7.4 |
39 | 39 | ||
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch new file mode 100644 index 000000000..3a27aacfe --- /dev/null +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | Index: git/SConstruct | ||
2 | =================================================================== | ||
3 | --- git.orig/SConstruct | ||
4 | +++ git/SConstruct | ||
5 | @@ -884,6 +884,14 @@ env_vars.Add('WINDOWS_OPENSSL_BIN', | ||
6 | help='Sets the path to the openssl binaries for packaging', | ||
7 | default='c:/openssl/bin') | ||
8 | |||
9 | +env_vars.Add('PREFIX', | ||
10 | + help='installation prefix') | ||
11 | + | ||
12 | +env_vars.Add('prefix', | ||
13 | + help='installation prefix') | ||
14 | + | ||
15 | + | ||
16 | + | ||
17 | # -- Validate user provided options -- | ||
18 | |||
19 | # A dummy environment that should *only* have the variables we have set. In practice it has | ||
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch new file mode 100644 index 000000000..c6035894e --- /dev/null +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | Index: git/src/mongo/util/errno_util.cpp | ||
2 | =================================================================== | ||
3 | --- git.orig/src/mongo/util/errno_util.cpp | ||
4 | +++ git/src/mongo/util/errno_util.cpp | ||
5 | @@ -49,6 +49,16 @@ const char kUnknownMsg[] = "Unknown erro | ||
6 | const int kBuflen = 256; // strerror strings in non-English locales can be large. | ||
7 | } // namespace | ||
8 | |||
9 | +inline char const * strerror_r_helper( char const * r, char const * ) | ||
10 | +{ | ||
11 | + return r; | ||
12 | +} | ||
13 | + | ||
14 | +inline char const * strerror_r_helper( int r, char const * buffer ) | ||
15 | +{ | ||
16 | + return r == 0? buffer: "Unknown error"; | ||
17 | +} | ||
18 | + | ||
19 | std::string errnoWithDescription(int errNumber) { | ||
20 | #if defined(_WIN32) | ||
21 | if (errNumber == -1) | ||
22 | @@ -63,7 +73,7 @@ std::string errnoWithDescription(int err | ||
23 | |||
24 | #if defined(__GNUC__) && defined(_GNU_SOURCE) && \ | ||
25 | (!defined(__ANDROID_API__) || !(__ANDROID_API__ <= 22)) && !defined(EMSCRIPTEN) | ||
26 | - msg = strerror_r(errNumber, buf, kBuflen); | ||
27 | + msg = strerror_r_helper(strerror_r(errNumber, buf, kBuflen)); | ||
28 | #elif defined(_WIN32) | ||
29 | |||
30 | LPWSTR errorText = nullptr; | ||
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch index a2e1f795b..2cea9bc31 100644 --- a/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch | |||
@@ -1,17 +1,17 @@ | |||
1 | From a1c77702926eb8546ff96b00b5b994f7478dabae Mon Sep 17 00:00:00 2001 | 1 | From cc95a8878fa581b164dee8fb1f07b05b9d919ef0 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 2 Sep 2017 13:13:15 -0700 | 3 | Date: Sat, 2 Sep 2017 13:13:15 -0700 |
4 | Subject: [PATCH 4/4] wiredtiger: Disable strtouq on musl | 4 | Subject: [PATCH 09/10] wiredtiger: Disable strtouq on musl |
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | --- | 7 | --- |
8 | src/third_party/wiredtiger/build_linux/wiredtiger_config.h | 2 +- | 8 | src/third_party/wiredtiger/build_linux/wiredtiger_config.h | 2 +- |
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | 10 | ||
11 | Index: git/src/third_party/wiredtiger/build_linux/wiredtiger_config.h | 11 | diff --git a/src/third_party/wiredtiger/build_linux/wiredtiger_config.h b/src/third_party/wiredtiger/build_linux/wiredtiger_config.h |
12 | =================================================================== | 12 | index 82e9994..0399a67 100644 |
13 | --- git.orig/src/third_party/wiredtiger/build_linux/wiredtiger_config.h | 13 | --- a/src/third_party/wiredtiger/build_linux/wiredtiger_config.h |
14 | +++ git/src/third_party/wiredtiger/build_linux/wiredtiger_config.h | 14 | +++ b/src/third_party/wiredtiger/build_linux/wiredtiger_config.h |
15 | @@ -104,7 +104,7 @@ | 15 | @@ -104,7 +104,7 @@ |
16 | #define HAVE_STRING_H 1 | 16 | #define HAVE_STRING_H 1 |
17 | 17 | ||
@@ -21,3 +21,6 @@ Index: git/src/third_party/wiredtiger/build_linux/wiredtiger_config.h | |||
21 | 21 | ||
22 | /* Define to 1 if you have the `sync_file_range' function. */ | 22 | /* Define to 1 if you have the `sync_file_range' function. */ |
23 | /* #undef HAVE_SYNC_FILE_RANGE */ | 23 | /* #undef HAVE_SYNC_FILE_RANGE */ |
24 | -- | ||
25 | 2.7.4 | ||
26 | |||
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch b/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch index c06898758..15bd7da70 100644 --- a/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch | |||
@@ -1,25 +1,33 @@ | |||
1 | Add alises for arm64 which is same as aarch64 | 1 | From c9fc9e9a44b0fb764ce86a5e57f17d3c5bbfd8cd Mon Sep 17 00:00:00 2001 |
2 | From: Vincent Prince <vincent.prince.fr@gmail.com> | ||
3 | Date: Mon, 16 Sep 2019 13:37:10 +0200 | ||
4 | Subject: [PATCH 05/10] Add alises for arm64 which is same as aarch64 | ||
2 | 5 | ||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
4 | Upstream-Status: Pending | 7 | Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com> |
8 | --- | ||
9 | SConstruct | 1 + | ||
10 | src/third_party/IntelRDFPMathLib20U1/SConscript | 2 +- | ||
11 | src/third_party/wiredtiger/SConscript | 2 +- | ||
12 | 3 files changed, 3 insertions(+), 2 deletions(-) | ||
5 | 13 | ||
6 | Index: git/SConstruct | 14 | diff --git a/SConstruct b/SConstruct |
7 | =================================================================== | 15 | index e63cf15..5593c78 100644 |
8 | --- git.orig/SConstruct | 16 | --- a/SConstruct |
9 | +++ git/SConstruct | 17 | +++ b/SConstruct |
10 | @@ -1055,6 +1055,7 @@ elif endian == "big": | 18 | @@ -1129,6 +1129,7 @@ elif endian == "big": |
11 | processor_macros = { | 19 | processor_macros = { |
12 | 'arm' : { 'endian': 'little', 'defines': ('__arm__',) }, | 20 | 'arm' : { 'endian': 'little', 'defines': ('__arm__',) }, |
13 | 'aarch64' : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')}, | 21 | 'aarch64' : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')}, |
14 | + 'arm64' : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')}, | 22 | + 'arm64' : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')}, |
15 | 'i386' : { 'endian': 'little', 'defines': ('__i386', '_M_IX86')}, | 23 | 'i386' : { 'endian': 'little', 'defines': ('__i386', '_M_IX86')}, |
16 | 'ppc64le' : { 'endian': 'little', 'defines': ('__powerpc64__',)}, | 24 | 'ppc64le' : { 'endian': 'little', 'defines': ('__powerpc64__',)}, |
17 | 's390x' : { 'endian': 'big', 'defines': ('__s390x__',)}, | 25 | 's390x' : { 'endian': 'big', 'defines': ('__s390x__',)}, |
18 | Index: git/src/third_party/IntelRDFPMathLib20U1/SConscript | 26 | diff --git a/src/third_party/IntelRDFPMathLib20U1/SConscript b/src/third_party/IntelRDFPMathLib20U1/SConscript |
19 | =================================================================== | 27 | index f23c071..fb82cd6 100644 |
20 | --- git.orig/src/third_party/IntelRDFPMathLib20U1/SConscript | 28 | --- a/src/third_party/IntelRDFPMathLib20U1/SConscript |
21 | +++ git/src/third_party/IntelRDFPMathLib20U1/SConscript | 29 | +++ b/src/third_party/IntelRDFPMathLib20U1/SConscript |
22 | @@ -308,7 +308,7 @@ if processor == 'i386': | 30 | @@ -308,7 +308,7 @@ if processor == 'i386' or processor == 'emscripten': |
23 | elif processor == 'arm': | 31 | elif processor == 'arm': |
24 | cpp_defines['IA32'] = '1' | 32 | cpp_defines['IA32'] = '1' |
25 | cpp_defines['ia32'] = '1' | 33 | cpp_defines['ia32'] = '1' |
@@ -28,11 +36,11 @@ Index: git/src/third_party/IntelRDFPMathLib20U1/SConscript | |||
28 | cpp_defines['efi2'] = '1' | 36 | cpp_defines['efi2'] = '1' |
29 | cpp_defines['EFI2'] = '1' | 37 | cpp_defines['EFI2'] = '1' |
30 | # Using 64 bit little endian | 38 | # Using 64 bit little endian |
31 | Index: git/src/third_party/wiredtiger/SConscript | 39 | diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript |
32 | =================================================================== | 40 | index cdd090b..97a1b3b 100644 |
33 | --- git.orig/src/third_party/wiredtiger/SConscript | 41 | --- a/src/third_party/wiredtiger/SConscript |
34 | +++ git/src/third_party/wiredtiger/SConscript | 42 | +++ b/src/third_party/wiredtiger/SConscript |
35 | @@ -151,7 +151,7 @@ condition_map = { | 43 | @@ -152,7 +152,7 @@ condition_map = { |
36 | 'POSIX_HOST' : not env.TargetOSIs('windows'), | 44 | 'POSIX_HOST' : not env.TargetOSIs('windows'), |
37 | 'WINDOWS_HOST' : env.TargetOSIs('windows'), | 45 | 'WINDOWS_HOST' : env.TargetOSIs('windows'), |
38 | 46 | ||
@@ -41,3 +49,6 @@ Index: git/src/third_party/wiredtiger/SConscript | |||
41 | 'POWERPC_HOST' : env['TARGET_ARCH'] == 'ppc64le', | 49 | 'POWERPC_HOST' : env['TARGET_ARCH'] == 'ppc64le', |
42 | 'X86_HOST' : env['TARGET_ARCH'] == 'x86_64', | 50 | 'X86_HOST' : env['TARGET_ARCH'] == 'x86_64', |
43 | 'ZSERIES_HOST' : env['TARGET_ARCH'] == 's390x', | 51 | 'ZSERIES_HOST' : env['TARGET_ARCH'] == 's390x', |
52 | -- | ||
53 | 2.7.4 | ||
54 | |||
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb index ed0551736..d3c19d6c4 100644 --- a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb | |||
@@ -3,17 +3,18 @@ LICENSE = "SSPL-1 & Apache-2.0 & Zlib" | |||
3 | LIC_FILES_CHKSUM = "file://LICENSE-Community.txt;md5=3a865f27f11f43ecbe542d9ea387dcf1 \ | 3 | LIC_FILES_CHKSUM = "file://LICENSE-Community.txt;md5=3a865f27f11f43ecbe542d9ea387dcf1 \ |
4 | file://APACHE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" | 4 | file://APACHE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" |
5 | 5 | ||
6 | DEPENDS = "openssl libpcre libpcap zlib boost curl python \ | 6 | DEPENDS = "openssl libpcre libpcap zlib boost curl python3 \ |
7 | python-setuptools-native python-typing-native \ | 7 | python3-setuptools-native \ |
8 | python-pyyaml-native python-cheetah-native \ | 8 | python3-pyyaml-native python3-cheetah-native \ |
9 | python3-psutil-native python3-regex-native \ | ||
9 | " | 10 | " |
10 | 11 | ||
11 | inherit scons dos2unix siteinfo pythonnative | 12 | inherit scons dos2unix siteinfo python3native |
12 | 13 | ||
13 | PV = "4.0.6+git${SRCPV}" | 14 | PV = "4.2.0+git${SRCPV}" |
14 | #v4.0.6 | 15 | #v4.2.0 |
15 | SRCREV = "caa42a1f75a56c7643d0b68d3880444375ec42e3" | 16 | SRCREV = "18ce5c9f56a01f2c933a720d64707f3456f81c8b" |
16 | SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.0 \ | 17 | SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.2 \ |
17 | file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ | 18 | file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ |
18 | file://0001-Use-long-long-instead-of-int64_t.patch \ | 19 | file://0001-Use-long-long-instead-of-int64_t.patch \ |
19 | file://0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch \ | 20 | file://0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch \ |
@@ -21,9 +22,11 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.0 \ | |||
21 | file://arm64-support.patch \ | 22 | file://arm64-support.patch \ |
22 | file://0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch \ | 23 | file://0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch \ |
23 | file://0001-Support-deprecated-resolver-functions.patch \ | 24 | file://0001-Support-deprecated-resolver-functions.patch \ |
25 | file://0003-Fix-unknown-prefix-env.patch \ | ||
24 | " | 26 | " |
25 | SRC_URI_append_libc-musl ="\ | 27 | SRC_URI_append_libc-musl ="\ |
26 | file://0002-Fix-default-stack-size-to-256K.patch \ | 28 | file://0002-Fix-default-stack-size-to-256K.patch \ |
29 | file://0003-fix-musl-strerror_r.patch \ | ||
27 | file://0004-wiredtiger-Disable-strtouq-on-musl.patch \ | 30 | file://0004-wiredtiger-Disable-strtouq-on-musl.patch \ |
28 | " | 31 | " |
29 | 32 | ||
@@ -37,6 +40,7 @@ COMPATIBLE_HOST ?= '(x86_64|i.86|powerpc64|arm|aarch64).*-linux' | |||
37 | 40 | ||
38 | COMPATIBLE_HOST_arm = "null" | 41 | COMPATIBLE_HOST_arm = "null" |
39 | COMPATIBLE_HOST_libc-musl_x86 = "null" | 42 | COMPATIBLE_HOST_libc-musl_x86 = "null" |
43 | COMPATIBLE_HOST_toolchain-clang_x86 = "null" | ||
40 | 44 | ||
41 | PACKAGECONFIG ??= "tcmalloc" | 45 | PACKAGECONFIG ??= "tcmalloc" |
42 | # gperftools compilation fails for arm below v7 because of missing support of | 46 | # gperftools compilation fails for arm below v7 because of missing support of |
@@ -75,5 +79,3 @@ scons_do_install() { | |||
75 | ${STAGING_BINDIR_NATIVE}/scons install ${EXTRA_OESCONS}|| \ | 79 | ${STAGING_BINDIR_NATIVE}/scons install ${EXTRA_OESCONS}|| \ |
76 | die "scons install execution failed." | 80 | die "scons install execution failed." |
77 | } | 81 | } |
78 | |||
79 | PNBLACKLIST[mongodb] = "Since bbclass scons convert to python3, build mongodb failed" | ||