diff options
| author |   Peter Levine <plevine457@gmail.com> | 2019-06-07 01:50:38 -0400 |
|---|---|---|
| committer |   Michał Górny <mgorny@gentoo.org> | 2019-06-15 22:29:27 +0200 |
| commit | b8467b0c198796db565e24118f34853384e57e12 (patch) | |
| tree | 87596317c7045acc9141d7438d77774f900298b6 /dev-cpp | |
| parent | dev-cpp/gtest: Don't apply patch to gtest-9999 (diff) | |
| download | gentoo-b8467b0c198796db565e24118f34853384e57e12.tar.gz gentoo-b8467b0c198796db565e24118f34853384e57e12.tar.bz2 gentoo-b8467b0c198796db565e24118f34853384e57e12.zip | |
dev-cpp/gtest: Update patch for gtest-9999
Update the gtest-1.8.0-increase-clone-stack-size.patch for
gtest-9999 to reflect upstream changes
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Peter Levine <plevine457@gmail.com>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/gtest/files/gtest-9999-increase-clone-stack-size.patch | 14 | ||||
| -rw-r--r-- | dev-cpp/gtest/gtest-9999.ebuild | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/dev-cpp/gtest/files/gtest-9999-increase-clone-stack-size.patch b/dev-cpp/gtest/files/gtest-9999-increase-clone-stack-size.patch new file mode 100644 index 000000000000..5e4dc47f704e --- /dev/null +++ b/dev-cpp/gtest/files/gtest-9999-increase-clone-stack-size.patch @@ -0,0 +1,14 @@ +Bug: https://bugs.gentoo.org/629620 +Upstream PR: https://github.com/google/googletest/pull/2276 + +--- 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() * 8); + // 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-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild index e546efa392a8..98ce51d82aec 100644 --- a/dev-cpp/gtest/gtest-9999.ebuild +++ b/dev-cpp/gtest/gtest-9999.ebuild @@ -28,7 +28,7 @@ DEPEND="test? ( ${PYTHON_DEPS} )" RDEPEND="!dev-cpp/gmock" PATCHES=( - "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch + "${FILESDIR}"/${PN}-9999-increase-clone-stack-size.patch ) pkg_setup() { |