commit: f526bd2a3316a2fe76b231f731d9e9da2cd6a464 Author: Peter Levine <plevine457 <AT> gmail <DOT> com> AuthorDate: Fri Sep 14 00:39:00 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Sep 22 07:07:09 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f526bd2a
dev-cpp/gtest: Update gtest-9999-fix-gcc6-undefined-behavior.patch Package-Manager: Portage-2.3.49, Repoman-2.3.10 ...patch => gtest-1.8.0-fix-gcc6-undefined-behavior.patch} | 0 .../files/gtest-9999-fix-gcc6-undefined-behavior.patch | 14 +++++--------- dev-cpp/gtest/gtest-1.8.0-r1.ebuild | 2 +- dev-cpp/gtest/gtest-1.8.0.ebuild | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch b/dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.patch similarity index 100% copy from dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch copy to dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.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 index eadfe619738..8dfed46d458 100644 --- a/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch +++ b/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch @@ -2,19 +2,15 @@ Fix build with GCC 6 due to lifetime issues. --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc -@@ -2654,10 +2654,12 @@ +@@ -2693,10 +2693,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"); + // 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/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild index 96cb8b936bf..3fd0d1438be 100644 --- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild +++ b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild @@ -22,7 +22,7 @@ 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-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 diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild index 3dbd8e1a06d..fec38c4bc24 100644 --- a/dev-cpp/gtest/gtest-1.8.0.ebuild +++ b/dev-cpp/gtest/gtest-1.8.0.ebuild @@ -22,7 +22,7 @@ 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-fix-gcc6-undefined-behavior.patch "${FILESDIR}"/${PN}-1.8.0-multilib-strict.patch "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch )