From 24e90d16abe865dfd40f750c554f4eef0189c558 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Mon, 16 Nov 2020 13:05:18 -0800
Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap

The content of this branch was automatically imported from Fedora ELN
with the following as its source:
https://src.fedoraproject.org/rpms/gtest#41e5efd7adc3bb052d96d61279beef52676da94e
---
 gtest-gcc11.patch | 15 +++++++++++++++
 gtest.spec        |  6 +++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 gtest-gcc11.patch

diff --git a/gtest-gcc11.patch b/gtest-gcc11.patch
new file mode 100644
index 0000000..85ff110
--- /dev/null
+++ b/gtest-gcc11.patch
@@ -0,0 +1,15 @@
+diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
+index da09a1c..4d6343f 100644
+--- a/googletest/src/gtest-death-test.cc
++++ b/googletest/src/gtest-death-test.cc
+@@ -1289,7 +1289,10 @@ static void StackLowerThanAddress(const void* ptr,
+ GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+ static void StackLowerThanAddress(const void* ptr, bool* result) {
+   int dummy;
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wpointer-compare"
+   *result = (&dummy < ptr);
++#pragma GCC diagnostic push
+ }
+ 
+ // Make sure AddressSanitizer does not tamper with the stack here.
diff --git a/gtest.spec b/gtest.spec
index da126c7..51328ba 100644
--- a/gtest.spec
+++ b/gtest.spec
@@ -1,7 +1,7 @@
 Summary:        Google C++ testing framework
 Name:           gtest
 Version:        1.10.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 # scripts/generator/* are ASL 2.0
 License:        BSD and ASL 2.0
 URL:            https://github.com/google/googletest
@@ -18,6 +18,7 @@ Patch100:       gtest-1.8.1-libversion.patch
 ## Add missing pkgconfig requires information to reflect reality
 ### Submitted: https://github.com/google/googletest/pull/2756
 Patch101:       gtest-1.10.0-add-missing-pkgconfig-requires.patch
+Patch102:       %{name}-gcc11.patch
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
@@ -110,6 +111,9 @@ sed -e "s/set(GOOGLETEST_VERSION .*)/set(GOOGLETEST_VERSION %{version})/" -i CMa
 %{_libdir}/pkgconfig/gmock_main.pc
 
 %changelog
+* Sun Nov 15 2020 Jeff Law <law@redhat.com> - 1.10.0-4
+- Disable pointer-comparison warning in StackLowerThanAddress
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild