summaryrefslogtreecommitdiff
path: root/dev-cpp/gtest
diff options
context:
space:
mode:
Diffstat (limited to 'dev-cpp/gtest')
-rw-r--r--dev-cpp/gtest/Manifest19
-rw-r--r--dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch (renamed from dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch)7
-rw-r--r--dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch98
-rw-r--r--dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.patch21
-rw-r--r--dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch40
-rw-r--r--[-rwxr-xr-x]dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch0
-rw-r--r--dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch17
-rw-r--r--dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch19
-rw-r--r--dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild (renamed from dev-cpp/gtest/gtest-1.10.0.ebuild)12
-rw-r--r--dev-cpp/gtest/gtest-1.8.0-r1.ebuild69
-rw-r--r--dev-cpp/gtest/gtest-1.8.0.ebuild68
-rw-r--r--dev-cpp/gtest/gtest-1.8.1-r1.ebuild74
-rw-r--r--dev-cpp/gtest/gtest-1.8.1.ebuild75
-rw-r--r--dev-cpp/gtest/gtest-9999.ebuild7
14 files changed, 16 insertions, 510 deletions
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 31c6433a03ac..15f30f66f938 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,19 +1,8 @@
-AUX gtest-1.8.0-fix-doublefree.patch 4176 BLAKE2B 8488622dab43418cca28fe65b43ba4e022d06e31517748226a61e18c366f33a7b8fb50ba8f0ca7a175774c580e0b356684414856a75d74363c816c5ab9ba2ef3 SHA512 5dc0b987ea9516c4ef0c8e50c58091431606d3555c0f24b2ea5786e47f8497664ca3fb55bb400e07c502319dfbf2d0a09d5121985defd8e8b5e29062a4a51134
-AUX gtest-1.8.0-fix-gcc6-undefined-behavior.patch 665 BLAKE2B 181253b829413cf41001236c4696fd35171345d9a933f62d0903d463e0bcf80004a0124e4c5b5846f40c8cfe70dfccc7488e1840ccf6418d34a461c482db373a SHA512 fc6f11a06f9aa7b1c31f5abbec208704dd0f461fed36d421802843234bb3d9fe3f2e35482629546c1a8585c84fb0850768dd8b63e0f88cfe0508b00278d800cc
-AUX gtest-1.8.0-increase-clone-stack-size.patch 588 BLAKE2B a05c131193a4fa8e585c23b8c664e1e5065bd1c02424c763df64bd2b83c975b33d8a7e6a52a4a094d2304ff96edc4cc72d5bd0c54579546d7d3512164bc18d4a SHA512 ca1e97c48b1f3340ccda093c1bac9b5ddbb84db6e8dd9f6d9da95a0ef105125c9bea34bba359ee473c0b05d7db6a69c2bdde8f1cbb14aeab9d76f83a4cd4b9a4
-AUX gtest-1.8.0-multilib-strict.patch 1126 BLAKE2B 9b7835108dec3c05025762e7161bbc993e77c0ea433ddec465746cc93cd231cbe654a756822d3a0c368497788bb5642b6a490f917736b763f18ed31b8a629558 SHA512 45bb44e3f0743ec0bd9f440585610ed04cbbd8befed398844300e21710b28f755f1775cc005efcdd0b4f6d2ec2200ad2abe98b2c6764400ffa04242fe7ce06fc
+AUX gtest-1.10.0_p20200702-increase-clone-stack-size.patch 570 BLAKE2B dc6e87cc33314fa15b0bdf78baf6672915befe2c14c695681701975dfb3d6572b2254596789dc1cc2010db2bd391e1d26f17a3a83d6c3aa96a9252a0fd1ea3d5 SHA512 406f1f6e900b0fe2c042cb6d219f20586058e1e7e1af38ffa7059f0d5e6b24cebb7b034237d154d9669a9a860497a36b3c7a0308a0698af23bb07cb29cf38851
AUX gtest-1.9.0_pre20190607-increase-clone-stack-size.patch 565 BLAKE2B 6960b5318aa450f9309811f7cd412a652203404dbfb0cec7a2e308f3dc5ae1cf6a1225caff4a60d9e70468339e19e95abf50b5aa29cabde5960eb4f1f2571714 SHA512 7a9f65e93feca436791541378d1c5b740b3c111724c4075ff1f23ac616ece50aa7beb35f143df39c93184754331666b294fbab39cad189a8da1c3290846933b3
-AUX gtest-9999-fix-gcc6-undefined-behavior.patch 463 BLAKE2B d61c3a735ab5ecc8a44b5b7c294a25be86bdfb8bd589df954862b4ddee60f14f04b0b64e4be80b6ed9e191429d640f8fecf4dac3667e9c9d875feb494bd64bce SHA512 8ee1fe3ab2b9352f4a34ea9e2813344eb507a2c7d519d67d647dc511c280f2a4609eccebc2a122d8431989b4a8e43c6cb9c5650877a257681f2d37672f446227
-AUX gtest-9999-fix-py-tests.patch 820 BLAKE2B a6a860b6935bd5f0bbe720f5af741448dd29878ca16d4187b84a40df4ec3ca216951ab0dfb1a89bebe2da1ad89f975e22ef6cdaced488de72b06953e185fd0d1 SHA512 4a059704303fffe508bd099544caaab5e4c819c978d6c104dce302e82348dd41fd63390459828a5f6161624dfd47aed5dc9cb466d36796904d598e0b10427949
-DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547 SHA512 7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532
-DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
-DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
+DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
DIST gtest-1.9.0_pre20190607.tar.gz 958396 BLAKE2B 64ae2c86a320a6ed56d6f99383591f7a0176e3f1291144bddf6dc82733c78177963f95516bbaed494318d3d7451d164aeb0d4a192b415414bcc25b9875cf6e82 SHA512 6c17ba303ec1dc8a989075a6dc0eda9b023345d00f6b43e588676cc2cd291f8c508744e4aba86a6c6b651329ce47419ad04d5765ca5978eda507a1643e8a92c3
-EBUILD gtest-1.10.0.ebuild 1737 BLAKE2B 1fd5e2da577f2cef04221fdfb3067271315dc9fb1f26faa7c4cd089c3e6fc16371ae8653478f41f11a5a6d19872e96942a91e31a2c0c7e0b1abedf2ddbdffa16 SHA512 907824429dbd2ad887d95bea35bbf4b0ca0f40ef88701f21d458d1c74fb120d340083d7bc2deec6488e59ff130a485797e512020a4d47ee074dc8e5b5e29ac5f
-EBUILD gtest-1.8.0-r1.ebuild 1654 BLAKE2B 9381e1615e94c729584b22ffc3f7df0b214b2dc98fc9cfd726840d09f1362a01158db13a511fb3d81864496fdf6aef08bef95f14940b11bc95073aaf60290f93 SHA512 41c059641a5fc682670b8c6a44bde761d37d839a0bfc39eedc0cf6ea796e6eb967f6c71c6f6e9522b24e9d255f9290cdee3d813d365ce0bef412dd741806642b
-EBUILD gtest-1.8.0.ebuild 1615 BLAKE2B 93c85ff5d8e37dc39bb3140f4895a4363f03f0e9f3ee0ad7906dc77a5bd07661a70713476aec8bbf9997155c072c68c1262e25f757c1f436927139f871068363 SHA512 8318f473552901bd2b93855aac9cfd5329361e800600422fe3f8a3aafb6a10ef65fc052e66f90c8a05b04da227dced540a9f9b4828defda5ef950d48b639a9c1
-EBUILD gtest-1.8.1-r1.ebuild 1664 BLAKE2B a49c61695009bf8ef7baf7d6a12d2192ffe5cb624fcf400c8b50ab432a3074abdba5e60a83dc9455658f38c1755b1f36c743745e408ba419d4c3d54b603e1964 SHA512 0eb3d7912331b19df27f1b24628cc1cfff1a1d0a40d4f4f944f0150c9e1300b4b74ffc7dfea5d7e72103974ae29c25cfa3a9f6c803b32505566b03b340287a55
-EBUILD gtest-1.8.1.ebuild 1682 BLAKE2B e9600cc6895b4358600037718074a50e2a9314d32d4e8a6e9c56eb72b57efa3d8854303c394213e5983485e3a8367ae05691ae6f2acbd191c08a8c736d254dc7 SHA512 436c68370dbba677494920b4ec1ebbd5430552b47e4f2ad4d4d8b3def4d6b5de2ac42b4867506379da023c6ade7aa2b4f2ad1ea2e4f243d3b8830f0c8b8f2be2
+EBUILD gtest-1.10.0_p20200702.ebuild 1842 BLAKE2B faa0ccc6af4f2de130c89d44f5525ff4998c289d5377abe503fa907257dc516455ec643da92c7dfd439dae358d4cc8ba317deb65ea72dc780e21eb205c5cdbfd SHA512 586e0286527663de08c50556f4a6da60114b89e4dad6c7dbdd77090009ab36b8857ae4b6ce3f772faf7831a7503b77f2c168cc59f890a08aaecd567aa0eb47db
EBUILD gtest-1.9.0_pre20190607.ebuild 1758 BLAKE2B ade6b31a300fdcdc0cc43524640fc82740595b2b8be848848c77c9395dd609068192faf910d5dfb85e951f83847bacb1837c05d5e4b081595f6c3c2a1da18fdb SHA512 11a96924838187431e8e5a9713dc4885932edbfd912bc1d7291f6f55aae591d803526a20aa43d94b626920a4592bacdb7fb98ff54469f16b990f38edfc89cdf3
-EBUILD gtest-9999.ebuild 1724 BLAKE2B a3848289a32906b5f7c6b295d0560de87e1f17305fe028c7f21a0fcc9ef775f7e843c4a0bf7355703fe4956d97ed4a05b8be8ab17fc8baabdc8a668a4a05c8c1 SHA512 328e111ad8f48970b330a647b545470ac54bf5cbca1a6f18e9b68def364769021999721043798e133a157e6fa37a0cefa678ea8bb13542d07cca8743f13fea54
+EBUILD gtest-9999.ebuild 1707 BLAKE2B e3b986cad521ba806e07677e999571d792fe79151e0e8e81093749d51c49908165be06118b47b6ddf58e890aafaca69cd470f4a116aeac868b8ad2c7ef499a8b SHA512 67227afb86efd0d8f51a9e52ea7032bf149f9e2ecdef282db1951f7dd269f404ffe6875a453ed83115ed0674bf13bd02b870c726f6d64e5cf314868d7bbb5c5c
MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
diff --git a/dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch b/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
index 22ac0b6d4a12..3e06777ac9a9 100644
--- a/dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch
+++ b/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
@@ -1,5 +1,4 @@
-Bug: https://bugs.gentoo.org/629620
-Upstream PR: https://github.com/google/googletest/pull/1274
+Bug: https://bugs.gentoo.org/692464
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
@@ -7,8 +6,8 @@ Upstream PR: https://github.com/google/googletest/pull/1274
if (!use_fork) {
static const bool stack_grows_down = StackGrowsDown();
-- const size_t stack_size = getpagesize();
-+ const size_t stack_size = getpagesize() * 10;
+- const auto stack_size = static_cast<size_t>(getpagesize() * 2);
++ 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(NULL, stack_size, PROT_READ | PROT_WRITE,
MAP_ANON | MAP_PRIVATE, -1, 0);
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 40fa1f6668bc..000000000000
--- 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 <romain.geissler@gmail.com>
-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_link_libraries(gmock_main_no_rtti gmock)
-+
-+ cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}" src/gmock_main.cc)
-+ target_link_libraries(gmock_main_use_own_tuple gmock)
- endif()
--
- cxx_test_with_flags(gmock-more-actions_no_exception_test "${cxx_no_exception}"
- gmock_main_no_exception test/gmock-more-actions_test.cc)
-
diff --git a/dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.patch b/dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.patch
deleted file mode 100644
index eadfe6197389..000000000000
--- a/dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix build with GCC 6 due to lifetime issues.
-
---- a/googletest/src/gtest.cc
-+++ b/googletest/src/gtest.cc
-@@ -2654,10 +2654,12 @@
- test->Run();
- }
-
-- // Deletes the test object.
-- impl->os_stack_trace_getter()->UponLeavingGTest();
-- internal::HandleExceptionsInMethodIfSupported(
-- test, &Test::DeleteSelf_, "the test fixture's destructor");
-+ if (test != NULL) {
-+ // Deletes the test object.
-+ impl->os_stack_trace_getter()->UponLeavingGTest();
-+ internal::HandleExceptionsInMethodIfSupported(
-+ test, &Test::DeleteSelf_, "the test fixture's destructor");
-+ }
-
- result_.set_elapsed_time(internal::GetTimeInMillis() - start);
-
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
deleted file mode 100644
index c18b58e16fb6..000000000000
--- a/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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/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
index 38d515a48ddb..38d515a48ddb 100755..100644
--- 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
diff --git a/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch b/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch
deleted file mode 100644
index 8dfed46d4585..000000000000
--- a/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix build with GCC 6 due to lifetime issues.
-
---- a/googletest/src/gtest.cc
-+++ b/googletest/src/gtest.cc
-@@ -2693,10 +2693,12 @@
- test->Run();
- }
-
-+ if (test != NULL) {
- // Deletes the test object.
- impl->os_stack_trace_getter()->UponLeavingGTest();
- internal::HandleExceptionsInMethodIfSupported(
- test, &Test::DeleteSelf_, "the test fixture's destructor");
-+ }
-
- result_.set_elapsed_time(internal::GetTimeInMillis() - start);
-
diff --git a/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch b/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch
deleted file mode 100644
index ba63c7b3eeb3..000000000000
--- a/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix python tests that use broken generator expressions
-
---- a/googletest/cmake/internal_utils.cmake
-+++ b/googletest/cmake/internal_utils.cmake
-@@ -247,12 +247,12 @@
- add_test(
- NAME ${name}
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py
-- --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>)
-+ --build_dir=${CMAKE_CURRENT_BINARY_DIR})
- else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1)
- add_test(
- ${name}
- ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py
-- --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE})
-+ --build_dir=${CMAKE_CURRENT_BINARY_DIR})
- endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1)
- endif()
- endfunction()
diff --git a/dev-cpp/gtest/gtest-1.10.0.ebuild b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
index 12d496c44be4..4804dac673cf 100644
--- a/dev-cpp/gtest/gtest-1.10.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
@@ -4,11 +4,12 @@
EAPI=7
# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
CMAKE_ECLASS=cmake
inherit cmake-multilib python-any-r1
-MY_PV=1.10.x
+GOOGLETEST_COMMIT=aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e
if [[ ${PV} == "9999" ]]; then
inherit git-r3
@@ -20,7 +21,7 @@ else
URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}}
fi
SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+ KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S="${WORKDIR}"/googletest-${MY_PV}
fi
@@ -32,11 +33,10 @@ SLOT="0"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
-DEPEND="test? ( ${PYTHON_DEPS} )"
-RDEPEND="!dev-cpp/gmock"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
PATCHES=(
- "${FILESDIR}"/${PN}-1.9.0_pre20190607-increase-clone-stack-size.patch
+ "${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch
)
pkg_setup() {
diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
deleted file mode 100644
index bf4d578fa31f..000000000000
--- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python3_6 )
-
-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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-RDEPEND="!dev-cpp/gmock"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9999-fix-py-tests.patch
- "${FILESDIR}"/${PN}-1.8.0-fix-gcc6-undefined-behavior.patch
- "${FILESDIR}"/${PN}-1.8.0-multilib-strict.patch
- "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch
- "${FILESDIR}"/${PN}-1.8.0-fix-doublefree.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 doc; then
- docinto googletest
- dodoc -r googletest/docs/*
- docinto googlemock
- dodoc -r googlemock/docs/*
- fi
-
- if use examples; then
- docinto examples
- dodoc googletest/samples/*.{cc,h}
- fi
-}
diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild
deleted file mode 100644
index 2d1d2af328f7..000000000000
--- a/dev-cpp/gtest/gtest-1.8.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python3_6 )
-
-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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-RDEPEND="!dev-cpp/gmock"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9999-fix-py-tests.patch
- "${FILESDIR}"/${PN}-1.8.0-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}
-
-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 doc; then
- docinto googletest
- dodoc -r googletest/docs/*
- docinto googlemock
- dodoc -r googlemock/docs/*
- fi
-
- if use examples; then
- docinto examples
- dodoc googletest/samples/*.{cc,h}
- fi
-}
diff --git a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
deleted file mode 100644
index 030ed3477e90..000000000000
--- a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 )
-CMAKE_ECLASS=cmake
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/google/googletest"
-else
- SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
- S="${WORKDIR}"/googletest-release-${PV}
-fi
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="https://github.com/google/googletest"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-RDEPEND="!dev-cpp/gmock"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch
- "${FILESDIR}"/${PN}-1.8.0-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
-
- if use doc; then
- docinto googletest
- dodoc -r googletest/docs/.
- docinto googlemock
- dodoc -r googlemock/docs/.
- fi
-
- if use examples; then
- docinto examples
- dodoc googletest/samples/*.{cc,h}
- fi
-}
diff --git a/dev-cpp/gtest/gtest-1.8.1.ebuild b/dev-cpp/gtest/gtest-1.8.1.ebuild
deleted file mode 100644
index 4c66697b04aa..000000000000
--- a/dev-cpp/gtest/gtest-1.8.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 )
-
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/google/googletest"
-else
- SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
- S="${WORKDIR}"/googletest-release-${PV}
-fi
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="https://github.com/google/googletest"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-RDEPEND="!dev-cpp/gmock"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch
- "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_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
- -DBUILD_SHARED_LIBS=ON
-
- # tests
- -Dgmock_build_tests=$(usex test)
- -Dgtest_build_tests=$(usex test)
- -DPYTHON_EXECUTABLE="${PYTHON}"
- )
- cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use doc; then
- docinto googletest
- dodoc -r googletest/docs/.
- docinto googlemock
- dodoc -r googlemock/docs/.
- fi
-
- if use examples; then
- docinto examples
- dodoc googletest/samples/*.{cc,h}
- fi
-}
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index 753803041fce..40af1cfe82d5 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=7
# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
CMAKE_ECLASS=cmake
inherit cmake-multilib python-any-r1
@@ -31,11 +31,10 @@ SLOT="0"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
-DEPEND="test? ( ${PYTHON_DEPS} )"
-RDEPEND="!dev-cpp/gmock"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
PATCHES=(
- "${FILESDIR}"/${PN}-1.9.0_pre20190607-increase-clone-stack-size.patch
+ "${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch
)
pkg_setup() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-13 17:52:35 +0000