Attachment #587386 for bug #692464

View | Details | Raw Unified | Return to bug 692464
Collapse All | Expand All




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

Lines 35-41 DEPEND="test? ( ${PYTHON_DEPS} )" Link Here

(-)a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild (-2 / +1 lines)
35	RDEPEND="!dev-cpp/gmock"	35	RDEPEND="!dev-cpp/gmock"
36		36
37	PATCHES=(	37	PATCHES=(
38	"${FILESDIR}"/${PN}-1.9.0_pre20190607-add-mmap-stack-flag.patch	38	"${FILESDIR}"/${PN}-1.9.0_pre20190607-increase-clone-stack-size.patch
39	)	39	)
40		40
41	pkg_setup() {	41	pkg_setup() {
42	-

Return to bug 692464

Line 0 Link Here

(-)a/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch (+14 lines)
	1	Bug: https://bugs.gentoo.org/629620
	2	Upstream PR: https://github.com/google/googletest/pull/1274
	3
	4	--- a/googletest/src/gtest-death-test.cc
	5	+++ b/googletest/src/gtest-death-test.cc
	6	@@ -1354,7 +1354,7 @@
	7
	8	if (!use_fork) {
	9	static const bool stack_grows_down = StackGrowsDown();
	10	- const auto stack_size = static_cast<size_t>(getpagesize());
	11	+ const auto stack_size = static_cast<size_t>(getpagesize() * 10);
	12	// MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
	13	void* const stack = mmap(nullptr, stack_size, PROT_READ \| PROT_WRITE,
	14	MAP_ANON \| MAP_PRIVATE, -1, 0);