diff options
| -rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch | 19 | ||||
| -rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb | 7 |
2 files changed, 3 insertions, 23 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch deleted file mode 100644 index f08177d7b4..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | PTHREAD_STACK_MIN is no longer a compile time define in glibc 2.34+ and since | ||
| 2 | we only care for glibc and musl where PTHREAD_STACK_MIN is always defined there | ||
| 3 | is no need to check for constant called PTHREAD_STACK_MIN since its already defined | ||
| 4 | this fix may not work for wider audience but for OE needs its sufficient | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [OE-only fix] | ||
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 8 | --- a/src/third_party/boost-1.70.0/boost/thread/pthread/thread_data.hpp | ||
| 9 | +++ b/src/third_party/boost-1.70.0/boost/thread/pthread/thread_data.hpp | ||
| 10 | @@ -57,9 +57,7 @@ namespace boost | ||
| 11 | #else | ||
| 12 | std::size_t page_size = ::sysconf( _SC_PAGESIZE); | ||
| 13 | #endif | ||
| 14 | -#if PTHREAD_STACK_MIN > 0 | ||
| 15 | if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN; | ||
| 16 | -#endif | ||
| 17 | size = ((size+page_size-1)/page_size)*page_size; | ||
| 18 | int res = pthread_attr_setstacksize(&val_, size); | ||
| 19 | BOOST_VERIFY(!res && "pthread_attr_setstacksize failed"); | ||
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 21051a8958..f1a508f3f2 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 | |||
| @@ -11,9 +11,9 @@ DEPENDS = "openssl libpcap zlib boost curl python3 \ | |||
| 11 | 11 | ||
| 12 | inherit scons dos2unix siteinfo python3native systemd useradd | 12 | inherit scons dos2unix siteinfo python3native systemd useradd |
| 13 | 13 | ||
| 14 | PV = "4.4.19" | 14 | PV = "4.4.24" |
| 15 | #v4.4.18 | 15 | #v4.4.24 |
| 16 | SRCREV = "9a996e0ad993148b9650dc402e6d3b1804ad3b8a" | 16 | SRCREV = "0b86b9b7b42ad9970c5f818c527dd86c0634243a" |
| 17 | SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ | 17 | SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ |
| 18 | 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 \ |
| 19 | file://0001-Use-long-long-instead-of-int64_t.patch \ | 19 | file://0001-Use-long-long-instead-of-int64_t.patch \ |
| @@ -29,7 +29,6 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ | |||
| 29 | file://0001-include-needed-c-header.patch \ | 29 | file://0001-include-needed-c-header.patch \ |
| 30 | file://disable_runtime_check.patch \ | 30 | file://disable_runtime_check.patch \ |
| 31 | file://ppc64_ARCH_BITS.patch \ | 31 | file://ppc64_ARCH_BITS.patch \ |
| 32 | file://PTHREAD_STACK_MIN.patch \ | ||
| 33 | file://0001-add-explict-static_cast-size_t-to-maxMemoryUsageByte.patch \ | 32 | file://0001-add-explict-static_cast-size_t-to-maxMemoryUsageByte.patch \ |
| 34 | file://0001-server-Adjust-the-cache-alignment-assumptions.patch \ | 33 | file://0001-server-Adjust-the-cache-alignment-assumptions.patch \ |
| 35 | file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \ | 34 | file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \ |
