From 0e3dfdaeae8335b19b9bcb625ea56d3a905f3dd6 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 4 Feb 2025 12:54:53 -0500 Subject: [PATCH] Update to 20250127.0 (close RHBZ#2343779) --- .gitignore | 1 + 1739.patch | 38 ------------------- abseil-cpp.spec | 21 +++++++--- ...e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch | 26 +++++++++++++ sources | 2 +- 5 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 1739.patch create mode 100644 f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch diff --git a/.gitignore b/.gitignore index e659255..6ec58d5 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /abseil-cpp-20240116.2.tar.gz /abseil-cpp-20240722.0.tar.gz /abseil-cpp-20240722.1.tar.gz +/abseil-cpp-20250127.0.tar.gz diff --git a/1739.patch b/1739.patch deleted file mode 100644 index ca0c47d..0000000 --- a/1739.patch +++ /dev/null @@ -1,38 +0,0 @@ -From faf1b03a591f06933da02976119da5743f428e4f Mon Sep 17 00:00:00 2001 -From: Christopher Fore -Date: Mon, 5 Aug 2024 10:48:19 -0400 -Subject: [PATCH] container/internal: Explicitly include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC 15 will no longer include by default, resulting in build -failures in projects that do not explicitly include it. - -Error: -absl/container/internal/container_memory.h:66:27: error: ‘uintptr_t’ does not name a type - 66 | assert(reinterpret_cast(p) % Alignment == 0 && - | ^~~~~~~~~ -absl/container/internal/container_memory.h:31:1: note: ‘uintptr_t’ is defined in header ‘’; this is probably fixable by adding ‘#include ’ - 30 | #include "absl/utility/utility.h" - +++ |+#include - 31 | - -See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html -Signed-off-by: Christopher Fore ---- - absl/container/internal/container_memory.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/absl/container/internal/container_memory.h b/absl/container/internal/container_memory.h -index ba8e08a2d22..e7031797018 100644 ---- a/absl/container/internal/container_memory.h -+++ b/absl/container/internal/container_memory.h -@@ -17,6 +17,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/abseil-cpp.spec b/abseil-cpp.spec index 5cb3b02..b7a5f0d 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -1,8 +1,8 @@ # Installed library version -%global lib_version 2407.0.0 +%global lib_version 2501.0.0 Name: abseil-cpp -Version: 20240722.1 +Version: 20250127.0 Release: 1%{?dist} Summary: C++ Common Libraries @@ -24,9 +24,15 @@ License: Apache-2.0 AND LicenseRef-Fedora-Public-Domain URL: https://abseil.io Source: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz -# container/internal: Explicitly include -# https://github.com/abseil/abseil-cpp/pull/1739 -Patch: https://github.com/abseil/abseil-cpp/pull/1739.patch +# Disable the DestroyedCallsFail test on GCC due to flakiness. +# https://github.com/abseil/abseil-cpp/commit/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4 +# +# Fixes: +# +# [Bug]: In 20250127.0, flaky failures of Table.DestroyedCallsFail fails in +# absl_raw_hash_set_test +# https://github.com/abseil/abseil-cpp/issues/1834 +Patch: https://github.com/abseil/abseil-cpp/commit/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch BuildRequires: cmake # The default make backend would work just as well; ninja is observably faster @@ -184,6 +190,7 @@ skips="${skips})$" %{_libdir}/libabsl_log_internal_message.so.%{lib_version} %{_libdir}/libabsl_log_internal_nullguard.so.%{lib_version} %{_libdir}/libabsl_log_internal_proto.so.%{lib_version} +%{_libdir}/libabsl_log_internal_structured_proto.so.%{lib_version} %{_libdir}/libabsl_log_severity.so.%{lib_version} %{_libdir}/libabsl_log_sink.so.%{lib_version} %{_libdir}/libabsl_low_level_hash.so.%{lib_version} @@ -218,6 +225,7 @@ skips="${skips})$" %{_libdir}/libabsl_throw_delegate.so.%{lib_version} %{_libdir}/libabsl_time.so.%{lib_version} %{_libdir}/libabsl_time_zone.so.%{lib_version} +%{_libdir}/libabsl_tracing_internal.so.%{lib_version} %{_libdir}/libabsl_utf8_for_code_point.so.%{lib_version} %{_libdir}/libabsl_vlog_config_internal.so.%{lib_version} @@ -253,6 +261,9 @@ skips="${skips})$" %{_libdir}/pkgconfig/absl_*.pc %changelog +* Tue Feb 04 2025 Benjamin A. Beasley - 20250127.0-1 +- Update to 20250127.0 (close RHBZ#2343779) + * Fri Jan 24 2025 Benjamin A. Beasley - 20240722.1-1 - Update to 20240722.1 (close RHBZ#2341808) diff --git a/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch b/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch new file mode 100644 index 0000000..e0142b0 --- /dev/null +++ b/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch @@ -0,0 +1,26 @@ +From f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4 Mon Sep 17 00:00:00 2001 +From: Evan Brown +Date: Thu, 13 Feb 2025 16:11:49 -0800 +Subject: [PATCH] Disable the DestroyedCallsFail test on GCC due to flakiness. + +Fixes #1834. + +PiperOrigin-RevId: 726674816 +Change-Id: Icfbc73c8fac687819e9d94472a3071aa687f5c37 +--- + absl/container/internal/raw_hash_set_test.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/absl/container/internal/raw_hash_set_test.cc b/absl/container/internal/raw_hash_set_test.cc +index b03934dd4d6..e04add6efff 100644 +--- a/absl/container/internal/raw_hash_set_test.cc ++++ b/absl/container/internal/raw_hash_set_test.cc +@@ -3782,6 +3782,8 @@ TEST(Table, ReentrantCallsFail) { + TEST(Table, DestroyedCallsFail) { + #ifdef NDEBUG + GTEST_SKIP() << "Destroyed checks only enabled in debug mode."; ++#elif !defined(__clang__) && defined(__GNUC__) ++ GTEST_SKIP() << "Flaky on GCC."; + #else + absl::optional t; + t.emplace({1}); diff --git a/sources b/sources index 93f68f1..e661046 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abseil-cpp-20240722.1.tar.gz) = 6062a10220d1250127e2216cea65833f10f37459331254b59df437b5061af81a9645cab39479700cf1843ef7dee51fe125241b0ecb9f715705a45dce4ffae89e +SHA512 (abseil-cpp-20250127.0.tar.gz) = 2a021faad807ee3e23548716ffa4785dc2409edbb4be676cc4bc01d47885760de340f0a4afdcbf0aaa835affd6d78f7bc319bbf7d337dbc30e7a559d0088e4bd