commit:     482e7cfce9dff16b7457c507accbc7e7dcf8ed6c
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Mon Apr 18 06:17:10 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 20:28:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=482e7cfc

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 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);

Reply via email to