diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-05-11 10:38:24 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-05-11 11:07:08 -0700 |
| commit | c04080a70369e1fc9913a467ea99a3f44ee2a836 (patch) | |
| tree | 4d9e726dd6207a747ab1fe3db6640e22643b8335 | |
| parent | 026638c2924d8bafdd4f788576cef89d31038478 (diff) | |
| download | meta-openembedded-c04080a70369e1fc9913a467ea99a3f44ee2a836.tar.gz | |
mongodb: Do not use MINSIGSTKSZ
glibc 2.34 has made MINSIGSTKSZ non-constant
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Do-not-use-MINSIGSTKSZ.patch | 34 | ||||
| -rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Do-not-use-MINSIGSTKSZ.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Do-not-use-MINSIGSTKSZ.patch new file mode 100644 index 0000000000..0ee64e9c6c --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Do-not-use-MINSIGSTKSZ.patch @@ -0,0 +1,34 @@ +From 027044a692b588ef586d495f65eb58b07cc711a3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 11 May 2021 10:15:51 -0700 +Subject: [PATCH] Do not use MINSIGSTKSZ + +Since glibc 2.34+ MINSIGSTKSZ is no more a constant. So, +let's hardwire this for now until better fix is found. +64Kb should be good anyway + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/mongo/stdx/thread.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/mongo/stdx/thread.h b/src/mongo/stdx/thread.h +index f8058279e3..f31f309959 100644 +--- a/src/mongo/stdx/thread.h ++++ b/src/mongo/stdx/thread.h +@@ -104,10 +104,7 @@ private: + // . N Y : 4,344 | 13,048 | 7,352 + // . Y Y : 4,424 | 13,672 | 8,392 + // ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt ) +- static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10; +- +- static constexpr std::size_t kStackSize = +- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ}); ++ static constexpr std::size_t kStackSize = std::size_t{64} << 10; + std::unique_ptr<std::byte[]> _stackStorage = std::make_unique<std::byte[]>(kStackSize); + + #else // !MONGO_HAS_SIGALTSTACK +-- +2.31.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 54178bf75a..cfa2bc18c2 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 @@ -29,6 +29,7 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4 \ file://0001-include-needed-c-header.patch \ file://disable_runtime_check.patch \ file://ppc64_ARCH_BITS.patch \ + file://0001-Do-not-use-MINSIGSTKSZ.patch \ " SRC_URI_append_libc-musl ="\ file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \ |