commit: a6b7f9142590452d2779e12379b6ca856e236d92 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Nov 16 11:58:36 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 16 11:58:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b7f914
dev-cpp/abseil-cpp: fix 20210324.1 build with glibc-2.34 Closes: https://bugs.gentoo.org/823990 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild | 1 + .../files/abseil-cpp-20210324.1-glibc-2.34.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild index 2414ecd661e2..087d0e5ce2b8 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild @@ -36,6 +36,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-20200923-arm_no_crypto.patch" + "${FILESDIR}/${PN}-20210324.1-glibc-2.34.patch" ) src_prepare() { diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20210324.1-glibc-2.34.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20210324.1-glibc-2.34.patch new file mode 100644 index 000000000000..99b868d3101f --- /dev/null +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20210324.1-glibc-2.34.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/823990 +https://github.com/abseil/abseil-cpp/commit/a9831f1cbf93fb18dd951453635f488037454ce9.patch +--- a/absl/debugging/failure_signal_handler.cc ++++ b/absl/debugging/failure_signal_handler.cc +@@ -136,7 +136,8 @@ 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<size_t>(SIGSTKSZ, 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.
