From a8e7f942de8428277162346dccab9e88e1fecea9 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Mar 09 2021 01:47:17 +0000 Subject: Add patch to match constant type for std::max --- diff --git a/abseil-cpp-20200923.3-typematch.patch b/abseil-cpp-20200923.3-typematch.patch new file mode 100644 index 0000000..c7335c3 --- /dev/null +++ b/abseil-cpp-20200923.3-typematch.patch @@ -0,0 +1,12 @@ +diff -up ./absl/debugging/failure_signal_handler.cc.typematch ./absl/debugging/failure_signal_handler.cc +--- ./absl/debugging/failure_signal_handler.cc.typematch 2021-03-08 20:43:57.158396960 -0500 ++++ ./absl/debugging/failure_signal_handler.cc 2021-03-08 20:44:07.971430229 -0500 +@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() { + #else + const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; + #endif +- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; ++ size_t stack_size = (std::max(SIGSTKSZ, static_cast(65536)) + page_mask) & ~page_mask; + #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \ + defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER) + // Account for sanitizer instrumentation requiring additional stack space. diff --git a/abseil-cpp.spec b/abseil-cpp.spec index e63dec1..fc3cd66 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -10,8 +10,11 @@ License: ASL 2.0 URL: https://abseil.io Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: abseil-cpp-20200923.3-typematch.patch + BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: make %description Abseil is an open-source collection of C++ library code designed to augment