summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Levine <plevine457@gmail.com>2022-04-18 02:17:10 -0400
committerSam James <sam@gentoo.org>2022-04-18 21:28:28 +0100
commit482e7cfce9dff16b7457c507accbc7e7dcf8ed6c (patch)
treede7fedc1a525dd01d7e9bfd66a04c1bdd31410e3 /dev-cpp/gtest/files
parentdev-cpp/gtest: remove redundant ebuild (diff)
downloadgentoo-482e7cfce9dff16b7457c507accbc7e7dcf8ed6c.tar.gz
gentoo-482e7cfce9dff16b7457c507accbc7e7dcf8ed6c.tar.bz2
gentoo-482e7cfce9dff16b7457c507accbc7e7dcf8ed6c.zip
dev-cpp/gtest: fix testcase failure with musl
Empirically, "getpagesize() * 12" instead of "getpagesize() * 10" appears to be enough to memory to stave off a stack overflow when built against musl libc. Closes: https://bugs.gentoo.org/834068 Closes: https://github.com/gentoo/gentoo/pull/25073 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Peter Levine <plevine457@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-cpp/gtest/files')
-rw-r--r--dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch3
1 files changed, 2 insertions, 1 deletions
diff --git a/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch b/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
index 3e06777ac9a9..0c47681ba347 100644
--- a/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
+++ b/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
@@ -1,4 +1,5 @@
Bug: https://bugs.gentoo.org/692464
+ https://bugs.gentoo.org/834068
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
@@ -7,7 +8,7 @@ Bug: https://bugs.gentoo.org/692464
if (!use_fork) {
static const bool stack_grows_down = StackGrowsDown();
- const auto stack_size = static_cast<size_t>(getpagesize() * 2);
-+ const auto stack_size = static_cast<size_t>(getpagesize() * 10);
++ const auto stack_size = static_cast<size_t>(getpagesize() * 12);
// MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE,
MAP_ANON | MAP_PRIVATE, -1, 0);