[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/files/, dev-cpp/gtest/

2023-09-04 Thread David Seifert 
commit: c2604b771b585f12be9f353b343e8a4d684945cb
Author: Peter Levine  gmail  com>
AuthorDate: Mon Sep  4 10:08:09 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Sep  4 10:08:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2604b77

dev-cpp/gtest: drop 1.11.0

Closes: https://github.com/gentoo/gentoo/pull/32177
Signed-off-by: Peter Levine  gmail.com>
Signed-off-by: David Seifert  gentoo.org>

 dev-cpp/gtest/Manifest |  1 -
 10.0_p20200702-increase-clone-stack-size.patch | 14 
 dev-cpp/gtest/gtest-1.11.0.ebuild  | 77 --
 3 files changed, 92 deletions(-)

diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 9eb89ff6a6ac..8f44d5904099 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,3 +1,2 @@
-DIST gtest-1.11.0.tar.gz 886330 BLAKE2B 
d11fdd485f292d96508cbc27a9a444ab69b86571cc594298fd3f0e6d4bd8d6ec20dea848fe11be165d34054b2251ad377f0930f852914feaa1416ff156986a9c
 SHA512 
6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28
 DIST gtest-1.13.0.tar.gz 862871 BLAKE2B 
d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1
 SHA512 
70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e
 DIST gtest-1.14.0.tar.gz 867764 BLAKE2B 
c457f55ac572b9fb1553eee3df7eeeaf1e7dd2c3d747dd5e90dd279038fa5c71bb7b7d9ba1cf7e6143898b2a1d24d100584bd2a48ded41a426870c4825eec1b2
 SHA512 
765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c

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
deleted file mode 100644
index 0c47681ba347..
--- a/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-@@ -1070,7 +1070,7 @@
- 
-   if (!use_fork) {
- static const bool stack_grows_down = StackGrowsDown();
--const auto stack_size = static_cast(getpagesize() * 2);
-+const auto stack_size = static_cast(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);

diff --git a/dev-cpp/gtest/gtest-1.11.0.ebuild 
b/dev-cpp/gtest/gtest-1.11.0.ebuild
deleted file mode 100644
index 0881eaf88cfe..
--- a/dev-cpp/gtest/gtest-1.11.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/google/googletest";
-else
-   if [[ -z ${GOOGLETEST_COMMIT} ]]; then
-   
SRC_URI="https://github.com/google/googletest/archive/refs/tags/release-${PV}.tar.gz
-   -> ${P}.tar.gz"
-   S="${WORKDIR}"/googletest-release-${PV}
-   else
-   
SRC_URI="https://github.com/google/googletest/archive/${GOOGLETEST_COMMIT}.tar.gz
-   -> ${P}.tar.gz"
-   S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
-   fi
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
-fi
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="https://github.com/google/googletest";
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch
-)
-
-pkg_setup() {
-   use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   sed -i -e '/set(cxx_base_flags /s:-Werror::' \
-   googletest/cmake/internal_utils.cmake || die "sed failed!"
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   -DBUILD_GMOCK=ON
-   -DINSTALL_GTEST=ON
-
-   # tests
-   -Dgmock_build_tests=$(usex test)
-   -Dgtest_build_tests=$(usex test)
-   -DPYTHON_EXECUTABLE="${PYTHON}"
-   )
-   cmake_src_configure
-}
-
-multilib_src_install_all() {
-   einstalldocs
-
-   newdoc googletest/README.md README.googletest.md
-   newdoc googlemock/README.m

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/files/

2022-04-18 Thread Sam James 
commit: 482e7cfce9dff16b7457c507accbc7e7dcf8ed6c
Author: Peter Levine  gmail  com>
AuthorDate: Mon Apr 18 06:17:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 18 20:28:28 2022 +
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  gmail.com>
Signed-off-by: Sam James  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(getpagesize() * 2);
-+const auto stack_size = static_cast(getpagesize() * 10);
++const auto stack_size = static_cast(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);

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/files/, dev-cpp/gtest/

2020-07-19 Thread Joonas Niilola 
commit: ffde382e8f81ecdbf853552f01e2a5358877a9da
Author: Peter Levine  gmail  com>
AuthorDate: Fri Jul  3 01:10:30 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jul 19 10:43:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffde382e

dev-cpp/gtest: Remove older versions

Leave the latest stable , latest unstable, and live ebuilds.

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Peter Levine  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16556
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-cpp/gtest/Manifest |  3 -
 .../gtest/files/gtest-1.8.0-fix-doublefree.patch   | 98 --
 .../gtest-1.8.0-fix-gcc6-undefined-behavior.patch  | 21 -
 .../gtest-1.8.0-increase-clone-stack-size.patch| 14 
 .../gtest/files/gtest-1.8.0-multilib-strict.patch  | 40 -
 .../gtest--fix-gcc6-undefined-behavior.patch   | 17 
 dev-cpp/gtest/files/gtest--fix-py-tests.patch  | 19 -
 dev-cpp/gtest/gtest-1.10.0.ebuild  | 80 --
 dev-cpp/gtest/gtest-1.8.0-r1.ebuild| 69 ---
 dev-cpp/gtest/gtest-1.8.0.ebuild   | 68 ---
 dev-cpp/gtest/gtest-1.8.1-r1.ebuild| 74 
 dev-cpp/gtest/gtest-1.8.1.ebuild   | 75 -
 12 files changed, 578 deletions(-)

diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index d97bace4da9..49066ef5fa4 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,5 +1,2 @@
-DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 
96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547
 SHA512 
7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B 
c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d
 SHA512 
715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
-DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B 
ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb75e018f0171c2fdaeb4de3bb339548265e50de79e6
 SHA512 
1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
-DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 
40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1
 SHA512 
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
 DIST gtest-1.9.0_pre20190607.tar.gz 958396 BLAKE2B 
64ae2c86a320a6ed56d6f99383591f7a0176e3f1291144bddf6dc82733c78177963f95516bbaed494318d3d7451d164aeb0d4a192b415414bcc25b9875cf6e82
 SHA512 
6c17ba303ec1dc8a989075a6dc0eda9b023345d00f6b43e588676cc2cd291f8c508744e4aba86a6c6b651329ce47419ad04d5765ca5978eda507a1643e8a92c3

diff --git a/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch 
b/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch
deleted file mode 100644
index 40fa1f6668b..000
--- a/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Bug: https://bugs.gentoo.org/631698
-Upstream PR: https://github.com/google/googletest/pull/1339
-
-From 0663ce9024c9b78ddf6eb3fc1ceb45361ed91767 Mon Sep 17 00:00:00 2001
-From: Romain Geissler 
-Date: Sat, 2 Dec 2017 22:47:20 +0100
-Subject: [PATCH] Fix double free when building Gtest/GMock in shared libraries
- and linking a test executable with both.
-

- googlemock/CMakeLists.txt | 63 ++-
- 1 file changed, 40 insertions(+), 23 deletions(-)
-
-diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
-index 724fdd5f0..f7bad8afc 100644
 a/googlemock/CMakeLists.txt
-+++ b/googlemock/CMakeLists.txt
-@@ -86,16 +86,23 @@ endif()
- # Google Mock libraries.  We build them using more strict warnings than what
- # are used for other targets, to ensure that Google Mock can be compiled by
- # a user aggressive about warnings.
--cxx_library(gmock
--"${cxx_strict}"
--"${gtest_dir}/src/gtest-all.cc"
--src/gmock-all.cc)
--
--cxx_library(gmock_main
--"${cxx_strict}"
--"${gtest_dir}/src/gtest-all.cc"
--src/gmock-all.cc
--src/gmock_main.cc)
-+if (MSVC)
-+  cxx_library(gmock
-+  "${cxx_strict}"
-+  "${gtest_dir}/src/gtest-all.cc"
-+  src/gmock-all.cc)
-+
-+  cxx_library(gmock_main
-+  "${cxx_strict}"
-+  "${gtest_dir}/src/gtest-all.cc"
-+  src/gmock-all.cc
-+  src/gmock_main.cc)
-+else()
-+  cxx_library(gmock "${cx

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/files/

2020-07-19 Thread Joonas Niilola 
commit: fcb4e7ad557c7c41d87ef963f0eef18665b90ca1
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Jul 19 10:20:43 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jul 19 10:43:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb4e7ad

dev-cpp/gtest: fix ExecutableFile CI issue

Signed-off-by: Joonas Niilola  gentoo.org>

 .../gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch| 0
 .../gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

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
old mode 100755
new mode 100644

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
old mode 100755
new mode 100644

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/files/, dev-cpp/gtest/

2019-08-20 Thread Joonas Niilola 
commit: 856baf91fe985ca7e633f2611528a8c5f171c0b0
Author: Peter Levine  gmail  com>
AuthorDate: Tue Aug 20 06:10:29 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 21 05:06:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=856baf91

dev-cpp/gtest: Remove gtest-1.7.0-r1

Outdated EAPI and no reverse dependencies

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Peter Levine  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12751
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-cpp/gtest/Manifest |  1 -
 .../files/configure-fix-pthread-linking.patch  | 93 --
 dev-cpp/gtest/gtest-1.7.0-r1.ebuild| 50 
 3 files changed, 144 deletions(-)

diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 263c2954cef..63ceaa70e4a 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,4 +1,3 @@
-DIST gtest-1.7.0.tar.gz 1001582 BLAKE2B 
3d10c1e502c2fac1500d07301031a9328b29027a3f9719137e09d2c47556cf52bbc978a8fb7b37330a94beafa27d24c3bfc247b2f0d51306b53f43e7ae2373b4
 SHA512 
a9f5c047b39efb2d11b55ee9913662ca402ac6837b3ad2d278ecfbd1caf32ed4546f169e3e92503d57bf3b62ccf89cd062da1c7ea3638aae98e868d2766363c3
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B 
ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb75e018f0171c2fdaeb4de3bb339548265e50de79e6
 SHA512 
1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 
40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1
 SHA512 
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
 DIST gtest-1.9.0_pre20190607.tar.gz 958396 BLAKE2B 
64ae2c86a320a6ed56d6f99383591f7a0176e3f1291144bddf6dc82733c78177963f95516bbaed494318d3d7451d164aeb0d4a192b415414bcc25b9875cf6e82
 SHA512 
6c17ba303ec1dc8a989075a6dc0eda9b023345d00f6b43e588676cc2cd291f8c508744e4aba86a6c6b651329ce47419ad04d5765ca5978eda507a1643e8a92c3

diff --git a/dev-cpp/gtest/files/configure-fix-pthread-linking.patch 
b/dev-cpp/gtest/files/configure-fix-pthread-linking.patch
deleted file mode 100644
index 75e5219b7a7..000
--- a/dev-cpp/gtest/files/configure-fix-pthread-linking.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From fb71154012e634a5e780e93af5434bcdafaf2b24 Mon Sep 17 00:00:00 2001
-From: Justin Bronder 
-Date: Mon, 15 Oct 2012 17:25:07 -0400
-Subject: [PATCH] configure:  fix pthread linking
-
-- Update the pthread check to make sure that we don't need -lpthread when
-compiling with -nostdlib.
-
-- Make sure that the necessary pthread library is passed to libtool.
-
-Fixes:
-
-$ ldd -r /usr/lib/libgtest.so
-linux-vdso.so.1 (0x7fffe7dff000)
-libstdc++.so.6 => /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/libstdc++.so.6 
(0x7fbe09a9f000)
-libc.so.6 => /lib64/libc.so.6 (0x7fbe096f7000)
-libgcc_s.so.1 => /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/libgcc_s.so.1 
(0x7fbe094e1000)
-libm.so.6 => /lib64/libm.so.6 (0x7fbe091ee000)
-/lib64/ld-linux-x86-64.so.2 (0x7fbe0a005000)
-undefined symbol: pthread_key_create(/usr/lib/libgtest.so)
-undefined symbol: pthread_getspecific   (/usr/lib/libgtest.so)
-undefined symbol: pthread_key_delete(/usr/lib/libgtest.so)
-undefined symbol: pthread_setspecific   (/usr/lib/libgtest.so)

- Makefile.am   |1 +
- m4/acx_pthread.m4 |   39 ++-
- 2 files changed, 39 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index cb350b7..db2606e 100644
 a/Makefile.am
-+++ b/Makefile.am
-@@ -181,6 +181,7 @@ endif
- lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la
- 
- lib_libgtest_la_SOURCES = src/gtest-all.cc
-+lib_libgtest_la_LIBADD = $(AM_LIBS)
- 
- pkginclude_HEADERS = \
-   include/gtest/gtest-death-test.h \
-diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4
-index 2cf20de..7fba4d9 100644
 a/m4/acx_pthread.m4
-+++ b/m4/acx_pthread.m4
-@@ -339,7 +339,44 @@ if test "x$acx_pthread_ok" = xyes; then
-  # so it's not safe to assume that we may use pthreads
-  acx_pthread_ok=no
-   fi
--  
-+   
-+   AC_MSG_CHECKING([whether what we have so far is sufficient with -nostdlib])
-+   CFLAGS="-nostdlib $CFLAGS"
-+   # we need c with nostdlib
-+   LIBS="$LIBS -lc" 
-+   AC_TRY_LINK([#include ],
-+ [pthread_t th; pthread_join(th, 0);
-+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
-+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-+ [done=yes],[done=no])
-+  
-+   if test "x$done" = xyes; then
-+  AC_MSG_RESULT([yes])
-+   else
-+  AC_MSG_RESULT([no])
-+   fi
-+   
-+   if test x"$done" = xno; then
-+  AC_MSG_CHECKING([whether -lpthread saves the day])
-

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/files/, dev-cpp/gtest/

2019-06-16 Thread Michał Górny 
commit: fac747ad8938ce04897dfe1d188260f42ce8b6cb
Author: Peter Levine  gmail  com>
AuthorDate: Sun Jun 16 23:55:31 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jun 17 06:25:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fac747ad

dev-cpp/gtest: Fix segfault in googletest-death-test

Fixes call to mmap to include MAP_GROWSDOWN flag for
stack auto-resizing.

Reported-by: tka  kamph.org>
Tested-by: Arfrever Frehtes Taifersar Arahesis  gmail.com>
Closes: https://bugs.gentoo.org/688162
Closes: https://github.com/gentoo/gentoo/pull/12271
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Peter Levine  gmail.com>
Signed-off-by: Michał Górny  gentoo.org>

 .../gtest-1.9.0_pre20190607-add-mmap-stack-flag.patch | 15 +++
 .../files/gtest--increase-clone-stack-size.patch  | 14 --
 dev-cpp/gtest/gtest-1.7.0-r1.ebuild   |  2 +-
 dev-cpp/gtest/gtest-1.8.0-r1.ebuild   |  2 +-
 dev-cpp/gtest/gtest-1.8.0.ebuild  |  2 +-
 dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild  |  2 +-
 dev-cpp/gtest/gtest-.ebuild   |  2 +-
 7 files changed, 20 insertions(+), 19 deletions(-)

diff --git 
a/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-add-mmap-stack-flag.patch 
b/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-add-mmap-stack-flag.patch
new file mode 100644
index 000..9a840aa5876
--- /dev/null
+++ b/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-add-mmap-stack-flag.patch
@@ -0,0 +1,15 @@
+Bug: https://bugs.gentoo.org/688162
+Upstream PR: https://github.com/google/googletest/pull/2276
+
+--- a/googletest/src/gtest-death-test.cc
 b/googletest/src/gtest-death-test.cc
+@@ -1357,6 +1357,9 @@ static pid_t ExecDeathTestSpawnChild(char* const* argv, 
int close_fd) {
+ const auto stack_size = static_cast(getpagesize());
+ // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
+ void* const stack = mmap(nullptr, stack_size, PROT_READ | PROT_WRITE,
++#if GTEST_OS_LINUX
++ (stack_grows_down ? MAP_GROWSDOWN : 0) | // 
Needed for stack auto-resizing
++#endif
+  MAP_ANON | MAP_PRIVATE, -1, 0);
+ GTEST_DEATH_TEST_CHECK_(stack != MAP_FAILED);
+ 

diff --git a/dev-cpp/gtest/files/gtest--increase-clone-stack-size.patch 
b/dev-cpp/gtest/files/gtest--increase-clone-stack-size.patch
deleted file mode 100644
index 5e4dc47f704..000
--- a/dev-cpp/gtest/files/gtest--increase-clone-stack-size.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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(getpagesize());
-+const auto stack_size = static_cast(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-1.7.0-r1.ebuild 
b/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
index f1185b2db0c..360809f62e7 100644
--- a/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"

diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild 
b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
index 18d837c58fc..0e0934020cd 100644
--- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6

diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild
index a2fc61eb5c4..da82dca28b2 100644
--- a/dev-cpp/gtest/gtest-1.8.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6

diff --git a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild 
b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
index 1ff88fb723f..9fc545d7fd8 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}--increase-clone-stack-size.patch
+   "${FILESDIR}"/${PN}-1.9.0_pre20190607-add-mmap-stack-flag.patch
 )
 
 pkg_setup() {

diff --git a/dev-cpp/gtest/gtest-.ebuild b/dev-cpp/gtest/gtest-.ebuild
index 685acf50c

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/files/, dev-cpp/gtest/

2018-01-09 Thread Mike Gilbert 
commit: c611133fd67da12a870fb9a64c8e8ae298df0e42
Author: Peter Levine  gmail  com>
AuthorDate: Mon Sep 25 21:37:13 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Jan  9 16:10:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c611133f

dev-cpp/gtest: Fix test failure with sandbox

Bug: https://bugs.gentoo.org/629620
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../files/gtest-1.8.0-increase-clone-stack-size.patch  | 14 ++
 dev-cpp/gtest/gtest-1.8.0.ebuild   |  1 +
 dev-cpp/gtest/gtest-.ebuild|  1 +
 3 files changed, 16 insertions(+)

diff --git a/dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch 
b/dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch
new file mode 100644
index 000..22ac0b6d4a1
--- /dev/null
+++ b/dev-cpp/gtest/files/gtest-1.8.0-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
+@@ -1070,7 +1070,7 @@
+ 
+   if (!use_fork) {
+ static const bool stack_grows_down = StackGrowsDown();
+-const size_t stack_size = getpagesize();
++const size_t stack_size = getpagesize() * 10;
+ // 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);

diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild
index 308a12ff6fd..afb24f111d5 100644
--- a/dev-cpp/gtest/gtest-1.8.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0.ebuild
@@ -24,6 +24,7 @@ PATCHES=(
"${FILESDIR}"/${PN}--fix-py-tests.patch
"${FILESDIR}"/${PN}--fix-gcc6-undefined-behavior.patch
"${FILESDIR}"/${PN}-1.8.0-multilib-strict.patch
+   "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch
 )
 
 S="${WORKDIR}"/googletest-release-${PV}

diff --git a/dev-cpp/gtest/gtest-.ebuild b/dev-cpp/gtest/gtest-.ebuild
index a4ab55ca6f1..79195676d08 100644
--- a/dev-cpp/gtest/gtest-.ebuild
+++ b/dev-cpp/gtest/gtest-.ebuild
@@ -29,6 +29,7 @@ RDEPEND="!dev-cpp/gmock"
 
 PATCHES=(
"${FILESDIR}"/${PN}--fix-gcc6-undefined-behavior.patch
+   "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/files/, dev-cpp/gtest/

2018-01-09 Thread Mike Gilbert 
commit: b6ff87f01454fa2c2525917e7d2ff2b0089ade02
Author: Peter Levine  gmail  com>
AuthorDate: Mon Jan  8 02:48:58 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Jan  9 16:10:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6ff87f0

dev-cpp/gtest: Fix double free error

Bug: https://bugs.gentoo.org/631698
Closes: https://github.com/gentoo/gentoo/pull/5605
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 .../gtest/files/gtest-1.8.0-fix-doublefree.patch   | 98 ++
 dev-cpp/gtest/gtest-1.7.0-r1.ebuild|  2 +-
 .../{gtest-1.8.0.ebuild => gtest-1.8.0-r1.ebuild}  |  3 +-
 dev-cpp/gtest/gtest-1.8.0.ebuild   |  2 +-
 dev-cpp/gtest/gtest-.ebuild|  1 +
 5 files changed, 103 insertions(+), 3 deletions(-)

diff --git a/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch 
b/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch
new file mode 100644
index 000..40fa1f6668b
--- /dev/null
+++ b/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch
@@ -0,0 +1,98 @@
+Bug: https://bugs.gentoo.org/631698
+Upstream PR: https://github.com/google/googletest/pull/1339
+
+From 0663ce9024c9b78ddf6eb3fc1ceb45361ed91767 Mon Sep 17 00:00:00 2001
+From: Romain Geissler 
+Date: Sat, 2 Dec 2017 22:47:20 +0100
+Subject: [PATCH] Fix double free when building Gtest/GMock in shared libraries
+ and linking a test executable with both.
+
+---
+ googlemock/CMakeLists.txt | 63 ++-
+ 1 file changed, 40 insertions(+), 23 deletions(-)
+
+diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
+index 724fdd5f0..f7bad8afc 100644
+--- a/googlemock/CMakeLists.txt
 b/googlemock/CMakeLists.txt
+@@ -86,16 +86,23 @@ endif()
+ # Google Mock libraries.  We build them using more strict warnings than what
+ # are used for other targets, to ensure that Google Mock can be compiled by
+ # a user aggressive about warnings.
+-cxx_library(gmock
+-"${cxx_strict}"
+-"${gtest_dir}/src/gtest-all.cc"
+-src/gmock-all.cc)
+-
+-cxx_library(gmock_main
+-"${cxx_strict}"
+-"${gtest_dir}/src/gtest-all.cc"
+-src/gmock-all.cc
+-src/gmock_main.cc)
++if (MSVC)
++  cxx_library(gmock
++  "${cxx_strict}"
++  "${gtest_dir}/src/gtest-all.cc"
++  src/gmock-all.cc)
++
++  cxx_library(gmock_main
++  "${cxx_strict}"
++  "${gtest_dir}/src/gtest-all.cc"
++  src/gmock-all.cc
++  src/gmock_main.cc)
++else()
++  cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
++  target_link_libraries(gmock gtest)
++  cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
++  target_link_libraries(gmock_main gmock)
++endif()
+ 
+ # If the CMake version supports it, attach header directory information
+ # to the targets for when we are part of a parent build (ie being pulled
+@@ -175,23 +182,33 @@ if (gmock_build_tests)
+   
+   # C++ tests built with non-standard compiler flags.
+ 
+-  cxx_library(gmock_main_no_exception "${cxx_no_exception}"
+-"${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+-
+-  cxx_library(gmock_main_no_rtti "${cxx_no_rtti}"
+-"${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
++  if (MSVC)
++cxx_library(gmock_main_no_exception "${cxx_no_exception}"
++  "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+ 
+-  if (NOT MSVC OR MSVC_VERSION LESS 1600)  # 1600 is Visual Studio 2010.
+-# Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that
+-# conflict with our own definitions. Therefore using our own tuple does 
not
+-# work on those compilers.
+-cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}"
++cxx_library(gmock_main_no_rtti "${cxx_no_rtti}"
+   "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+ 
+-cxx_test_with_flags(gmock_use_own_tuple_test "${cxx_use_own_tuple}"
+-  gmock_main_use_own_tuple test/gmock-spec-builders_test.cc)
++if (MSVC_VERSION LESS 1600)  # 1600 is Visual Studio 2010.
++  # Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that
++  # conflict with our own definitions. Therefore using our own tuple does 
not
++  # work on those compilers.
++  cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}"
++"${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
++
++  cxx_test_with_flags(gmock_use_own_tuple_test "${cxx_use_own_tuple}"
++gmock_main_use_own_tuple test/gmock-spec-builders_test.cc)
++endif()
++  else()
++cxx_library(gmock_main_no_exception "${cxx_no_exception}" 
src/gmock_main.cc)
++target_link_libraries(gmock_main_no_exception gmock)
++
++cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" src/gmock_main.cc)
++target_li

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/files/, dev-cpp/gtest/

2017-08-29 Thread Patrice Clement 
commit: fb37bc926a630ca175bc424843d57fe9d21a8f0a
Author: Peter Levine  gmail  com>
AuthorDate: Mon Aug 21 01:48:10 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Aug 29 20:30:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb37bc92

dev-cpp/gtest: version bump to 1.8.0.

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=602218
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-cpp/gtest/Manifest |  1 +
 .../gtest/files/gtest-1.8.0-multilib-strict.patch  | 40 +++
 dev-cpp/gtest/gtest-1.8.0.ebuild   | 59 ++
 3 files changed, 100 insertions(+)

diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index df31d40d6a7..0bc58c544eb 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1 +1,2 @@
 DIST gtest-1.7.0.tar.gz 1001582 SHA256 
c0f860eee47c86e0aeb462fd0bdfd70e3975297e0b8b178e0e03a95e1f6c9bc4 SHA512 
a9f5c047b39efb2d11b55ee9913662ca402ac6837b3ad2d278ecfbd1caf32ed4546f169e3e92503d57bf3b62ccf89cd062da1c7ea3638aae98e868d2766363c3
 WHIRLPOOL 
36edbdf8be7c3793a89918a3c43d74e75a6281a37c394f7d2f20506130a76aab04a3beddba01bf7f0e9b6901c7e834ca014c31c913c0ea846d3f6be9c93599d2
+DIST gtest-1.8.0.tar.gz 1281617 SHA256 
58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8 SHA512 
1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 WHIRLPOOL 
7d95c06818332f9596dbda03d21416012c00e05c78be0814279ab9e7059b9d836060bab83ad46d013ccf1ba40973680c0793d78ac22f6016773fd93aa97b779b

diff --git a/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch 
b/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch
new file mode 100644
index 000..c18b58e16fb
--- /dev/null
+++ b/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch
@@ -0,0 +1,40 @@
+--- a/googlemock/CMakeLists.txt
 b/googlemock/CMakeLists.txt
+@@ -11,6 +11,8 @@
+ 
+ option(gmock_build_tests "Build all of Google Mock's own tests." OFF)
+ 
++set(LIB_INSTALL_DIR lib CACHE STRING "Library install directory")
++
+ # A directory to find Google Test sources.
+ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt")
+   set(gtest_dir gtest)
+@@ -104,7 +106,7 @@
+ #
+ # Install rules
+ install(TARGETS gmock gmock_main
+-  DESTINATION lib)
++  DESTINATION ${LIB_INSTALL_DIR})
+ install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock
+   DESTINATION include)
+ 
+--- a/googletest/CMakeLists.txt
 b/googletest/CMakeLists.txt
+@@ -27,6 +27,8 @@
+   "Build gtest with internal symbols hidden in shared libraries."
+   OFF)
+ 
++set(LIB_INSTALL_DIR lib CACHE STRING "Library install directory")
++
+ # Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
+ include(cmake/hermetic_build.cmake OPTIONAL)
+ 
+@@ -103,7 +105,7 @@
+ #
+ # Install rules
+ install(TARGETS gtest gtest_main
+-  DESTINATION lib)
++  DESTINATION ${LIB_INSTALL_DIR})
+ install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest
+   DESTINATION include)
+ 

diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild
new file mode 100644
index 000..308a12ff6fd
--- /dev/null
+++ b/dev-cpp/gtest/gtest-1.8.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Python is required for tests and some build tasks.
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Google C++ Testing Framework"
+HOMEPAGE="https://github.com/google/googletest";
+SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+RDEPEND="!dev-cpp/gmock"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}--fix-py-tests.patch
+   "${FILESDIR}"/${PN}--fix-gcc6-undefined-behavior.patch
+   "${FILESDIR}"/${PN}-1.8.0-multilib-strict.patch
+)
+
+S="${WORKDIR}"/googletest-release-${PV}
+
+pkg_setup() {
+   use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DBUILD_GMOCK=ON
+   -DBUILD_GTEST=ON
+   -DLIB_INSTALL_DIR=$(get_libdir)
+   -Dgtest_build_samples=OFF
+   -Dgtest_disable_pthreads=OFF
+   -DBUILD_SHARED_LIBS=ON
+
+   # tests
+   -Dgmock_build_tests=$(usex test)
+   -Dgtest_build_tests=$(usex test)
+   -DPYTHON_EXECUTABLE="${PYTHON}"
+   )
+   cmake-utils_src_configure mycmakeargs
+}
+
+multilib_src_install_all() {
+   einstalldocs
+
+   if use examples; then
+   docinto examples
+   dodoc googletest/samples/*.{cc,h}
+   fi
+}