| 1 |
commit: f526bd2a3316a2fe76b231f731d9e9da2cd6a464 |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Sep 14 00:39:00 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 22 07:07:09 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f526bd2a |
| 7 |
|
| 8 |
dev-cpp/gtest: Update gtest-9999-fix-gcc6-undefined-behavior.patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 11 |
|
| 12 |
...patch => gtest-1.8.0-fix-gcc6-undefined-behavior.patch} | 0 |
| 13 |
.../files/gtest-9999-fix-gcc6-undefined-behavior.patch | 14 +++++--------- |
| 14 |
dev-cpp/gtest/gtest-1.8.0-r1.ebuild | 2 +- |
| 15 |
dev-cpp/gtest/gtest-1.8.0.ebuild | 2 +- |
| 16 |
4 files changed, 7 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
similarity index 100% |
| 20 |
copy from dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch |
| 21 |
copy to dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.patch |
| 22 |
|
| 23 |
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 |
| 24 |
index eadfe619738..8dfed46d458 100644 |
| 25 |
--- a/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch |
| 26 |
+++ b/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch |
| 27 |
@@ -2,19 +2,15 @@ Fix build with GCC 6 due to lifetime issues. |
| 28 |
|
| 29 |
--- a/googletest/src/gtest.cc |
| 30 |
+++ b/googletest/src/gtest.cc |
| 31 |
-@@ -2654,10 +2654,12 @@ |
| 32 |
+@@ -2693,10 +2693,12 @@ |
| 33 |
test->Run(); |
| 34 |
} |
| 35 |
|
| 36 |
-- // Deletes the test object. |
| 37 |
-- impl->os_stack_trace_getter()->UponLeavingGTest(); |
| 38 |
-- internal::HandleExceptionsInMethodIfSupported( |
| 39 |
-- test, &Test::DeleteSelf_, "the test fixture's destructor"); |
| 40 |
+ if (test != NULL) { |
| 41 |
-+ // Deletes the test object. |
| 42 |
-+ impl->os_stack_trace_getter()->UponLeavingGTest(); |
| 43 |
-+ internal::HandleExceptionsInMethodIfSupported( |
| 44 |
-+ test, &Test::DeleteSelf_, "the test fixture's destructor"); |
| 45 |
+ // Deletes the test object. |
| 46 |
+ impl->os_stack_trace_getter()->UponLeavingGTest(); |
| 47 |
+ internal::HandleExceptionsInMethodIfSupported( |
| 48 |
+ test, &Test::DeleteSelf_, "the test fixture's destructor"); |
| 49 |
+ } |
| 50 |
|
| 51 |
result_.set_elapsed_time(internal::GetTimeInMillis() - start); |
| 52 |
|
| 53 |
diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild |
| 54 |
index 96cb8b936bf..3fd0d1438be 100644 |
| 55 |
--- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild |
| 56 |
+++ b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild |
| 57 |
@@ -22,7 +22,7 @@ RDEPEND="!dev-cpp/gmock" |
| 58 |
|
| 59 |
PATCHES=( |
| 60 |
"${FILESDIR}"/${PN}-9999-fix-py-tests.patch |
| 61 |
- "${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch |
| 62 |
+ "${FILESDIR}"/${PN}-1.8.0-fix-gcc6-undefined-behavior.patch |
| 63 |
"${FILESDIR}"/${PN}-1.8.0-multilib-strict.patch |
| 64 |
"${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch |
| 65 |
"${FILESDIR}"/${PN}-1.8.0-fix-doublefree.patch |
| 66 |
|
| 67 |
diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild |
| 68 |
index 3dbd8e1a06d..fec38c4bc24 100644 |
| 69 |
--- a/dev-cpp/gtest/gtest-1.8.0.ebuild |
| 70 |
+++ b/dev-cpp/gtest/gtest-1.8.0.ebuild |
| 71 |
@@ -22,7 +22,7 @@ RDEPEND="!dev-cpp/gmock" |
| 72 |
|
| 73 |
PATCHES=( |
| 74 |
"${FILESDIR}"/${PN}-9999-fix-py-tests.patch |
| 75 |
- "${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch |
| 76 |
+ "${FILESDIR}"/${PN}-1.8.0-fix-gcc6-undefined-behavior.patch |
| 77 |
"${FILESDIR}"/${PN}-1.8.0-multilib-strict.patch |
| 78 |
"${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch |
| 79 |
) |
Archives