From eb50c68d589a25d5d8c02376e958c318e1ef76f2 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 5 Apr 2018 16:08:29 -0400 Subject: [PATCH] bump(dev-cpp/gtest): sync with upstream --- .../portage-stable/dev-cpp/gtest/Manifest | 9 +- .../files/gtest-1.8.0-fix-doublefree.patch | 98 +++++++++++++++++++ ...test-1.8.0-increase-clone-stack-size.patch | 14 +++ .../files/gtest-1.8.0-multilib-strict.patch | 40 ++++++++ ...est-9999-fix-gcc6-undefined-behavior.patch | 21 ++++ .../gtest/files/gtest-9999-fix-py-tests.patch | 19 ++++ .../dev-cpp/gtest/gtest-1.7.0-r1.ebuild | 10 +- .../dev-cpp/gtest/gtest-1.7.0.ebuild | 51 ---------- .../dev-cpp/gtest/gtest-1.8.0-r1.ebuild | 68 +++++++++++++ .../dev-cpp/gtest/gtest-1.8.0.ebuild | 67 +++++++++++++ .../dev-cpp/gtest/gtest-9999.ebuild | 76 ++++++++++++++ .../portage-stable/dev-cpp/gtest/metadata.xml | 12 ++- .../metadata/md5-cache/dev-cpp/gtest-1.7.0 | 12 --- .../metadata/md5-cache/dev-cpp/gtest-1.7.0-r1 | 8 +- .../metadata/md5-cache/dev-cpp/gtest-1.8.0 | 13 +++ .../metadata/md5-cache/dev-cpp/gtest-1.8.0-r1 | 13 +++ .../metadata/md5-cache/dev-cpp/gtest-9999 | 11 +++ 17 files changed, 459 insertions(+), 83 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.7.0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.8.0-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.8.0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-9999.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.7.0 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.8.0 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-9999 diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/Manifest b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/Manifest index 948bc76161..991727f450 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/Manifest @@ -1,7 +1,2 @@ -AUX configure-fix-pthread-linking.patch 3142 SHA256 501f42dd4f4f4412fcb18fc4eb5f1100f5c5a6b19610f6548bccc84989c6f83e SHA512 4347570606853c75e43d3d1abe449cd562538e531136658e6742f8e2dddcc1767932b427a063f711b868467ca85ff947f24c4ed3e328319bd0a739bb66093016 WHIRLPOOL 5ab7be10a9bd675398884f2a4ad8c30fef17412ff3fbaae5d14cf290ebf723ccc005d2ea1dd7ad68c8bd8db57d06cc0fadd79d7f9f2ab46ea5ed0a87df8201fb -DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049 -EBUILD gtest-1.7.0-r1.ebuild 1264 SHA256 91c985df4f89921c3596191f3f189087ebdccdb44a911c3a3808e7ad9003ca8b SHA512 8876d4ec8b2f8fef4e66b45eb2fa85b9674851a27d31c0569a8d99c9459a64e7b816da3a024311e826c982e02fd6aadba0015fc7a7c1413b2627a65e77fe117b WHIRLPOOL 6abfb2072d2db4f5076a2732176ae89c81273acbefdae291c5b297eecb4da6470e76de695fff1bea119e81cffd5de51a587d0958ad0e528249e2973f77f00074 -EBUILD gtest-1.7.0.ebuild 1230 SHA256 d71af37cab27bb38e8b40fd0740e1690e936b424d034ec240be8e97270f4f0fd SHA512 2c07a2f53d3a87327ca3d87a1dfbe112e30b9a9797be7dc0633d48a38fd4e7bd0b1ade694bc7c9379a247f16884dab68054c8f9b5b8818676c895b46599452b7 WHIRLPOOL 2adea7a687ec35c5068066a8937c94a5d64f15fbb2d9d5513b6626b141cccb86cf85edca6e651c039d2311b7e605695bebd7f0c8ee1c3851399ef1286e546d6d -MISC ChangeLog 3559 SHA256 3b1dc0b889ac8573edfb8347118debc48feb77e5009e253126ac6e21514de36b SHA512 027e1bef0ba59e6ccc4c09dfd6b40acb4437398cd3532068a7a3ac7bbf69270c64f1b6ac493704e87909e6a3fc71a72b4d22a1a616d4c66604482834041ff728 WHIRLPOOL e26b9cbda41d2266b1aea21dcd1721b7ee4bd250413cb6c5d4130a7072aef71c9af71302e10f1cc718e2ae10fde6d234d84b1541fede7b5b238718b73164a93c -MISC ChangeLog-2015 7122 SHA256 04a56c441092e2cc6ea69082630e26a82b369945219147611af9905eadc1d9ff SHA512 1baf81de23ffa96b2970b71238627b1ca895e1b2b943b962fd7782200c891c1e1f3d1ffc1e33aaa7095999c106698b4cff53643c3648bbc522a7edf317f17d8f WHIRLPOOL 22470f963e4d9ec80a3071e3d054768cbe489481365184f834e5e5ff67daa371f40c87cf57b00a3a0637fc9a8f18197b855ea87e7ae58bcc07b61d075a4ecb30 -MISC metadata.xml 371 SHA256 fef06171a8b6332c850cfd6b3313185fbd2cd4e970d4edd189c76d7c0e6ec9c1 SHA512 46d0776b3194d880ddca8ae4e561cfd5c5f55ab284520f3d0792dcff7054e41263c5a1a92c3424bec84b71f611b92e38ad5a3aff76d406b6ced1511e629f1bb2 WHIRLPOOL edd615580b8a682678f0a03f9e35f2bba61c4377df8b6617177e99d45c993965d7102bf272ac27178af898e8dd1e24c43e22a198c93fe46aa7e3a8c94abd9e57 +DIST gtest-1.7.0.tar.gz 1001582 BLAKE2B 3d10c1e502c2fac1500d07301031a9328b29027a3f9719137e09d2c47556cf52bbc978a8fb7b37330a94beafa27d24c3bfc247b2f0d51306b53f43e7ae2373b4 SHA512 a9f5c047b39efb2d11b55ee9913662ca402ac6837b3ad2d278ecfbd1caf32ed4546f169e3e92503d57bf3b62ccf89cd062da1c7ea3638aae98e868d2766363c3 +DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch new file mode 100644 index 0000000000..40fa1f6668 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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_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/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch new file mode 100644 index 0000000000..22ac0b6d4a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch new file mode 100644 index 0000000000..c18b58e16f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch new file mode 100644 index 0000000000..eadfe61973 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch @@ -0,0 +1,21 @@ +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/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch new file mode 100644 index 0000000000..ba63c7b3ee --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch @@ -0,0 +1,19 @@ +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}/$) ++ --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/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.7.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.7.0-r1.ebuild index 9f7e6e3a90..f1185b2db0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.7.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -12,15 +12,14 @@ inherit eutils python-any-r1 autotools-multilib DESCRIPTION="Google C++ Testing Framework" HOMEPAGE="https://github.com/google/googletest" -SRC_URI="https://googletest.googlecode.com/files/${P}.zip" +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" +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 static-libs" -DEPEND="app-arch/unzip - ${PYTHON_DEPS}" +DEPEND="${PYTHON_DEPS}" RDEPEND="" PATCHES=( @@ -32,7 +31,6 @@ src_prepare() { sed -i -r \ -e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \ Makefile.am || die - elibtoolize --reverse-deps autotools-multilib_src_prepare } diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.7.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.7.0.ebuild deleted file mode 100644 index d355137d0c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.7.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 -# Python is required for tests and some build tasks. -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-any-r1 autotools-multilib - -DESCRIPTION="Google C++ Testing Framework" -HOMEPAGE="https://github.com/google/googletest" -SRC_URI="https://googletest.googlecode.com/files/${P}.zip" - -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 static-libs" - -DEPEND="app-arch/unzip - ${PYTHON_DEPS}" -RDEPEND="" - -PATCHES=( - "${FILESDIR}/configure-fix-pthread-linking.patch" #371647 -) - -src_prepare() { - sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die - sed -i -r \ - -e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \ - Makefile.am || die - autotools-multilib_src_prepare -} - -multilib_src_install() { - default - multilib_is_native_abi && dobin scripts/gtest-config -} - -multilib_src_install_all() { - prune_libtool_files --all - einstalldocs - - if use examples ; then - insinto /usr/share/doc/${PF}/examples - doins samples/*.{cc,h} - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.8.0-r1.ebuild new file mode 100644 index 0000000000..68dc26c492 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.8.0-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2018 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="doc examples test" + +DEPEND="test? ( ${PYTHON_DEPS} )" +RDEPEND="!dev-cpp/gmock" + +PATCHES=( + "${FILESDIR}"/${PN}-9999-fix-py-tests.patch + "${FILESDIR}"/${PN}-9999-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/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.8.0.ebuild new file mode 100644 index 0000000000..3dbd8e1a06 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.8.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2018 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="doc examples test" + +DEPEND="test? ( ${PYTHON_DEPS} )" +RDEPEND="!dev-cpp/gmock" + +PATCHES=( + "${FILESDIR}"/${PN}-9999-fix-py-tests.patch + "${FILESDIR}"/${PN}-9999-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/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-9999.ebuild new file mode 100644 index 0000000000..06c94dbd49 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-9999.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2018 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 + +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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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" + +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 + "${FILESDIR}"/${PN}-1.8.0-fix-doublefree.patch +) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_GMOCK=ON + -DBUILD_GTEST=ON + -DINSTALL_GMOCK=ON + -DINSTALL_GTEST=ON + -Dgtest_build_samples=OFF + -Dgtest_disable_pthreads=OFF + + # currently only static libs work + # due to numerous ODR violations + # https://github.com/google/googletest/issues/930 + -DBUILD_SHARED_LIBS=OFF + + # 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/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/metadata.xml index b24115c076..f40cfed12c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/metadata.xml @@ -1,10 +1,16 @@ - + + plevine457@gmail.com + Peter Levine + + + proxy-maint@gentoo.org + Proxy Maintainers + - https://code.google.com/p/googletest/w/list - googletest + https://github.com/google/googletest/tree/master/googletest/docs google/googletest diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.7.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.7.0 deleted file mode 100644 index dfbdc47dae..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.7.0 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test -DEPEND=app-arch/unzip || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Google C++ Testing Framework -EAPI=5 -HOMEPAGE=https://github.com/google/googletest -IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -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 -LICENSE=BSD -SLOT=0 -SRC_URI=https://googletest.googlecode.com/files/gtest-1.7.0.zip -_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=4e9ef93bf57de821805b8cc45d26ac70 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.7.0-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.7.0-r1 index 0d890452c4..9de09d5d6b 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.7.0-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.7.0-r1 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile configure install prepare setup test -DEPEND=app-arch/unzip || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=Google C++ Testing Framework EAPI=5 HOMEPAGE=https://github.com/google/googletest IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -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 +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 LICENSE=BSD SLOT=0 -SRC_URI=https://googletest.googlecode.com/files/gtest-1.7.0.zip +SRC_URI=https://github.com/google/googletest/archive/release-1.7.0.tar.gz -> gtest-1.7.0.tar.gz _eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=4ad458cd5fbba9899a01ccbca1128f7a +_md5_=b16c5c120783a31f73760b623b689e7f diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.8.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.8.0 new file mode 100644 index 0000000000..f82ba0616a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.8.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare setup test +DEPEND=test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) ) sys-devel/make >=dev-util/cmake-3.7.2 +DESCRIPTION=Google C++ Testing Framework +EAPI=6 +HOMEPAGE=https://github.com/google/googletest +IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +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 +LICENSE=BSD +RDEPEND=!dev-cpp/gmock +SLOT=0 +SRC_URI=https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz +_eclasses_=cmake-multilib 7bc2cc09a4a5082b915541d447be8e5e cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 +_md5_=d4c1326546def1906135c186c6221a95 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1 new file mode 100644 index 0000000000..c3de7eee30 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare setup test +DEPEND=test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) ) sys-devel/make >=dev-util/cmake-3.7.2 +DESCRIPTION=Google C++ Testing Framework +EAPI=6 +HOMEPAGE=https://github.com/google/googletest +IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +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 +LICENSE=BSD +RDEPEND=!dev-cpp/gmock +SLOT=0 +SRC_URI=https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz +_eclasses_=cmake-multilib 7bc2cc09a4a5082b915541d447be8e5e cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 +_md5_=1c66eb5d43bc3b6d043f1e06d4a9e04d diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-9999 new file mode 100644 index 0000000000..92f4d9cebf --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/gtest-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure install prepare setup test unpack +DEPEND=test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1 +DESCRIPTION=Google C++ Testing Framework +EAPI=6 +HOMEPAGE=https://github.com/google/googletest +IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +LICENSE=BSD +RDEPEND=!dev-cpp/gmock +SLOT=0 +_eclasses_=cmake-multilib 7bc2cc09a4a5082b915541d447be8e5e cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 +_md5_=33c05ff1756085b614c7cd51e591e165