Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/, dev-cpp/gtest/files/
Date: Fri, 09 Oct 2020 08:53:22
Message-Id: 1602232990.b3279540b497ba8c748edb378abcf13f6f361911.mgorny@gentoo
1 commit: b3279540b497ba8c748edb378abcf13f6f361911
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 9 08:22:19 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 9 08:43:10 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3279540
7
8 dev-cpp/gtest: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-cpp/gtest/Manifest | 1 -
13 ...9.0_pre20190607-increase-clone-stack-size.patch | 13 ----
14 dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild | 80 ----------------------
15 3 files changed, 94 deletions(-)
16
17 diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
18 index 49066ef5fa4..1c0e1e6d97a 100644
19 --- a/dev-cpp/gtest/Manifest
20 +++ b/dev-cpp/gtest/Manifest
21 @@ -1,2 +1 @@
22 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
23 -DIST gtest-1.9.0_pre20190607.tar.gz 958396 BLAKE2B 64ae2c86a320a6ed56d6f99383591f7a0176e3f1291144bddf6dc82733c78177963f95516bbaed494318d3d7451d164aeb0d4a192b415414bcc25b9875cf6e82 SHA512 6c17ba303ec1dc8a989075a6dc0eda9b023345d00f6b43e588676cc2cd291f8c508744e4aba86a6c6b651329ce47419ad04d5765ca5978eda507a1643e8a92c3
24
25 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
26 deleted file mode 100644
27 index 38d515a48dd..00000000000
28 --- a/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch
29 +++ /dev/null
30 @@ -1,13 +0,0 @@
31 -Bug: https://bugs.gentoo.org/692464
32 -
33 ---- a/googletest/src/gtest-death-test.cc
34 -+++ b/googletest/src/gtest-death-test.cc
35 -@@ -1070,7 +1070,7 @@
36 -
37 - if (!use_fork) {
38 - static const bool stack_grows_down = StackGrowsDown();
39 -- const auto stack_size = static_cast<size_t>(getpagesize());
40 -+ const auto stack_size = static_cast<size_t>(getpagesize()* 10);
41 - // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
42 - void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE,
43 - MAP_ANON | MAP_PRIVATE, -1, 0);
44
45 diff --git a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
46 deleted file mode 100644
47 index 9aa2139201b..00000000000
48 --- a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
49 +++ /dev/null
50 @@ -1,80 +0,0 @@
51 -# Copyright 1999-2020 Gentoo Authors
52 -# Distributed under the terms of the GNU General Public License v2
53 -
54 -EAPI=7
55 -
56 -# Python is required for tests and some build tasks.
57 -PYTHON_COMPAT=( python2_7 )
58 -
59 -CMAKE_ECLASS=cmake
60 -GOOGLETEST_COMMIT=da10da05c262af0a9e8fa91789a272a3dec67655
61 -inherit cmake-multilib python-any-r1
62 -
63 -if [[ ${PV} == "9999" ]]; then
64 - inherit git-r3
65 - EGIT_REPO_URI="https://github.com/google/googletest"
66 -else
67 - if [[ -z ${GOOGLETEST_COMMIT} ]]; then
68 - MY_PV=release-${PV}
69 - else
70 - MY_PV=${GOOGLETEST_COMMIT}
71 - fi
72 - SRC_URI="https://github.com/google/googletest/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
73 - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
74 - S="${WORKDIR}"/googletest-${MY_PV}
75 -fi
76 -
77 -DESCRIPTION="Google C++ Testing Framework"
78 -HOMEPAGE="https://github.com/google/googletest"
79 -
80 -LICENSE="BSD"
81 -SLOT="0"
82 -IUSE="doc examples test"
83 -RESTRICT="!test? ( test )"
84 -
85 -DEPEND="test? ( ${PYTHON_DEPS} )"
86 -RDEPEND="!dev-cpp/gmock"
87 -
88 -PATCHES=(
89 - "${FILESDIR}"/${PN}-1.9.0_pre20190607-increase-clone-stack-size.patch
90 -)
91 -
92 -pkg_setup() {
93 - use test && python-any-r1_pkg_setup
94 -}
95 -
96 -src_prepare() {
97 - cmake_src_prepare
98 -
99 - sed -i -e '/set(cxx_base_flags /s:-Werror::' \
100 - googletest/cmake/internal_utils.cmake || die "sed failed!"
101 -}
102 -
103 -multilib_src_configure() {
104 - local mycmakeargs=(
105 - -DBUILD_GMOCK=ON
106 - -DINSTALL_GTEST=ON
107 -
108 - # tests
109 - -Dgmock_build_tests=$(usex test)
110 - -Dgtest_build_tests=$(usex test)
111 - -DPYTHON_EXECUTABLE="${PYTHON}"
112 - )
113 - cmake_src_configure
114 -}
115 -
116 -multilib_src_install_all() {
117 - einstalldocs
118 -
119 - if use doc; then
120 - docinto googletest
121 - dodoc -r googletest/docs/.
122 - docinto googlemock
123 - dodoc -r googlemock/docs/.
124 - fi
125 -
126 - if use examples; then
127 - docinto examples
128 - dodoc googletest/samples/*.{cc,h}
129 - fi
130 -}