[patch] Patch

gtest.patch (text/plain), 2.03 KB, created by Arfrever Frehtes Taifersar Arahesis on 2019-08-19 04:43:15 UTC

From a4e0c73a274f476b5b8d154c96c122c244959596 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
Date: Mon, 19 Aug 2019 04:39:38 +0000
Subject: [PATCH] dev-cpp/gtest: Try to fix googletest-death-test-test.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
---
 ...9.0_pre20190607-increase-clone-stack-size.patch | 14 ++++++++++++++
 dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild       |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch

diff --git a/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch b/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch
new file mode 100644
index 00000000000..d500899413b
--- /dev/null
+++ b/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch
@@ -0,0 +1,14 @@
+Bug: https://bugs.gentoo.org/629620
+Upstream PR: https://github.com/google/googletest/pull/1274
+
+--- a/googletest/src/gtest-death-test.cc
++++ b/googletest/src/gtest-death-test.cc
+@@ -1354,7 +1354,7 @@
+ 
+   if (!use_fork) {
+     static const bool stack_grows_down = StackGrowsDown();
+-    const auto stack_size = static_cast<size_t>(getpagesize());
++    const auto stack_size = static_cast<size_t>(getpagesize() * 10);
+     // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
+     void* const stack = mmap(nullptr, stack_size, PROT_READ | PROT_WRITE,
+                              MAP_ANON | MAP_PRIVATE, -1, 0);
diff --git a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
index be0b3f49f66..d6e7fce6446 100644
--- a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
+++ b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
@@ -35,7 +35,7 @@ DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="!dev-cpp/gmock"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.0_pre20190607-add-mmap-stack-flag.patch
+	"${FILESDIR}"/${PN}-1.9.0_pre20190607-increase-clone-stack-size.patch
 )
 
 pkg_setup() {
-- 
2.23.0