summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomáš Mózes <hydrapolic@gmail.com>2021-08-20 14:57:19 +0000
committerAlexys Jacob <ultrabug@gentoo.org>2021-08-20 20:07:18 +0200
commitaf45f6a7cb10bc582a6490d7c1466fef512322fb (patch)
treea655aa521502155342b9554fbcf5c15149faeb23 /dev-db/mongodb
parentdev-libs/pkcs11-helper: bump + fix build with new nss (diff)
downloadgentoo-af45f6a7cb10bc582a6490d7c1466fef512322fb.tar.gz
gentoo-af45f6a7cb10bc582a6490d7c1466fef512322fb.tar.bz2
gentoo-af45f6a7cb10bc582a6490d7c1466fef512322fb.zip
dev-db/mongodb: fix building with glibc-2.34
Patch taken from https://gerrit.openbmc-project.xyz/c/openbmc/openbmc/+/43608/11/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Do-not-use-MINSIGSTKSZ.patch Closes: https://bugs.gentoo.org/806773 Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/22052 Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
Diffstat (limited to 'dev-db/mongodb')
-rw-r--r--dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch (renamed from dev-db/mongodb/files/mongodb-5.0.3-fix-scons.patch)0
-rw-r--r--dev-db/mongodb/files/mongodb-5.0.2-glibc-2.34.patch16
-rw-r--r--dev-db/mongodb/files/mongodb-5.0.2-no-compass.patch (renamed from dev-db/mongodb/files/mongodb-5.0.3-no-compass.patch)0
-rw-r--r--dev-db/mongodb/files/mongodb-5.0.2-skip-no-exceptions.patch (renamed from dev-db/mongodb/files/mongodb-5.0.3-skip-no-exceptions.patch)0
-rw-r--r--dev-db/mongodb/files/mongodb-5.0.2-skip-reqs-check.patch (renamed from dev-db/mongodb/files/mongodb-5.0.3-skip-reqs-check.patch)0
-rw-r--r--dev-db/mongodb/mongodb-4.2.15.ebuild1
-rw-r--r--dev-db/mongodb/mongodb-4.4.8.ebuild1
-rw-r--r--dev-db/mongodb/mongodb-5.0.2.ebuild9
8 files changed, 23 insertions, 4 deletions
diff --git a/dev-db/mongodb/files/mongodb-5.0.3-fix-scons.patch b/dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch
index 2d1a2f9312bb..2d1a2f9312bb 100644
--- a/dev-db/mongodb/files/mongodb-5.0.3-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch
diff --git a/dev-db/mongodb/files/mongodb-5.0.2-glibc-2.34.patch b/dev-db/mongodb/files/mongodb-5.0.2-glibc-2.34.patch
new file mode 100644
index 000000000000..b9c5241be374
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-5.0.2-glibc-2.34.patch
@@ -0,0 +1,16 @@
+diff --git a/src/mongo/stdx/thread.h b/src/mongo/stdx/thread.h
+index 7b15bb56..4d8f73ad 100644
+--- a/src/mongo/stdx/thread.h
++++ b/src/mongo/stdx/thread.h
+@@ -105,10 +105,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
diff --git a/dev-db/mongodb/files/mongodb-5.0.3-no-compass.patch b/dev-db/mongodb/files/mongodb-5.0.2-no-compass.patch
index 777251577298..777251577298 100644
--- a/dev-db/mongodb/files/mongodb-5.0.3-no-compass.patch
+++ b/dev-db/mongodb/files/mongodb-5.0.2-no-compass.patch
diff --git a/dev-db/mongodb/files/mongodb-5.0.3-skip-no-exceptions.patch b/dev-db/mongodb/files/mongodb-5.0.2-skip-no-exceptions.patch
index ae69befcea82..ae69befcea82 100644
--- a/dev-db/mongodb/files/mongodb-5.0.3-skip-no-exceptions.patch
+++ b/dev-db/mongodb/files/mongodb-5.0.2-skip-no-exceptions.patch
diff --git a/dev-db/mongodb/files/mongodb-5.0.3-skip-reqs-check.patch b/dev-db/mongodb/files/mongodb-5.0.2-skip-reqs-check.patch
index 823d481c208f..823d481c208f 100644
--- a/dev-db/mongodb/files/mongodb-5.0.3-skip-reqs-check.patch
+++ b/dev-db/mongodb/files/mongodb-5.0.2-skip-reqs-check.patch
diff --git a/dev-db/mongodb/mongodb-4.2.15.ebuild b/dev-db/mongodb/mongodb-4.2.15.ebuild
index 9d517a063d26..8d8aba1df780 100644
--- a/dev-db/mongodb/mongodb-4.2.15.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.15.ebuild
@@ -56,6 +56,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
"${FILESDIR}/${PN}-4.2.15-no-compass.patch"
+ "${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
)
S="${WORKDIR}/${MY_P}"
diff --git a/dev-db/mongodb/mongodb-4.4.8.ebuild b/dev-db/mongodb/mongodb-4.4.8.ebuild
index 64dd932d7a16..714abb8c3b8d 100644
--- a/dev-db/mongodb/mongodb-4.4.8.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.8.ebuild
@@ -57,6 +57,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.8-no-compass.patch"
"${FILESDIR}/${PN}-4.4.1-boost.patch"
"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+ "${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
)
S="${WORKDIR}/${MY_P}"
diff --git a/dev-db/mongodb/mongodb-5.0.2.ebuild b/dev-db/mongodb/mongodb-5.0.2.ebuild
index 2976e876c8f0..03eb379258b4 100644
--- a/dev-db/mongodb/mongodb-5.0.2.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.2.ebuild
@@ -60,10 +60,11 @@ PDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-4.4.1-boost.patch"
"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
- "${FILESDIR}/${PN}-5.0.3-fix-scons.patch"
- "${FILESDIR}/${PN}-5.0.3-no-compass.patch"
- "${FILESDIR}/${PN}-5.0.3-skip-no-exceptions.patch"
- "${FILESDIR}/${PN}-5.0.3-skip-reqs-check.patch"
+ "${FILESDIR}/${PN}-5.0.2-fix-scons.patch"
+ "${FILESDIR}/${PN}-5.0.2-no-compass.patch"
+ "${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch"
+ "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
+ "${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
)
S="${WORKDIR}/${MY_P}"