From b637f17a22b2e791ad10538fc63ec0e71dacec11 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 21 Aug 2025 08:03:49 -0400 Subject: [PATCH] Update to 20250814.0 (close RHBZ#2389295) --- .gitignore | 1 + ...race.FixupNoFixupEquivalence-on-i386.patch | 27 ------------------- 1888.patch | 24 ----------------- abseil-cpp.spec | 24 +++++++---------- sources | 2 +- 5 files changed, 11 insertions(+), 67 deletions(-) delete mode 100644 0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch delete mode 100644 1888.patch diff --git a/.gitignore b/.gitignore index 6c1d88b..15a7c9d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /abseil-cpp-20250127.1.tar.gz /abseil-cpp-20250512.0.tar.gz /abseil-cpp-20250512.1.tar.gz +/abseil-cpp-20250814.0.tar.gz diff --git a/0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch b/0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch deleted file mode 100644 index a3346ce..0000000 --- a/0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 27e209f0e0270d2c7b6e64eeb5ca5a63843970fd Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" -Date: Thu, 15 May 2025 07:05:44 -0400 -Subject: [PATCH] Skip StackTrace.FixupNoFixupEquivalence on i386 - -https://github.com/abseil/abseil-cpp/issues/1887 ---- - absl/debugging/stacktrace_test.cc | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/absl/debugging/stacktrace_test.cc b/absl/debugging/stacktrace_test.cc -index e5565c1f..56cf3326 100644 ---- a/absl/debugging/stacktrace_test.cc -+++ b/absl/debugging/stacktrace_test.cc -@@ -88,6 +88,9 @@ ABSL_ATTRIBUTE_NOINLINE static void FixupNoFixupEquivalenceNoInline() { - #if defined(__riscv) - GTEST_SKIP() << "Skipping test on RISC-V due to pre-existing failure"; - #endif -+#if defined(__i386__) -+ GTEST_SKIP() << "https://github.com/abseil/abseil-cpp/issues/1887"; -+#endif - - #if ABSL_HAVE_ATTRIBUTE_WEAK - // This test is known not to pass on MSVC (due to weak symbols) --- -2.49.0 - diff --git a/1888.patch b/1888.patch deleted file mode 100644 index 719de6d..0000000 --- a/1888.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 395acb74da05fa35d924059a170ebd8267356b65 Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" -Date: Thu, 15 May 2025 06:55:00 -0400 -Subject: [PATCH] Adjust Table.GrowExtremelyLargeTable to avoid OOM on i386 - ---- - absl/container/internal/raw_hash_set_test.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/absl/container/internal/raw_hash_set_test.cc b/absl/container/internal/raw_hash_set_test.cc -index a5cbd44d3b2..2c55d0fc079 100644 ---- a/absl/container/internal/raw_hash_set_test.cc -+++ b/absl/container/internal/raw_hash_set_test.cc -@@ -4267,8 +4267,8 @@ struct ConstUint8Hash { - // 5. Finally we will catch up and go to overflow codepath. - TEST(Table, GrowExtremelyLargeTable) { - constexpr size_t kTargetCapacity = --#if defined(__wasm__) || defined(__asmjs__) -- NextCapacity(ProbedItem4Bytes::kMaxNewCapacity); // OOMs on WASM. -+#if defined(__wasm__) || defined(__asmjs__) || defined(__i386__) -+ NextCapacity(ProbedItem4Bytes::kMaxNewCapacity); // OOMs on WASM, 32-bit. - #else - NextCapacity(ProbedItem8Bytes::kMaxNewCapacity); - #endif diff --git a/abseil-cpp.spec b/abseil-cpp.spec index 66a8958..c65e4d2 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -1,8 +1,8 @@ # Installed library version -%global lib_version 2505.0.0 +%global lib_version 2508.0.0 Name: abseil-cpp -Version: 20250512.1 +Version: 20250814.0 Release: %autorelease Summary: C++ Common Libraries @@ -24,18 +24,6 @@ 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 -# Adjust Table.GrowExtremelyLargeTable to avoid OOM on i386 -# https://github.com/abseil/abseil-cpp/pull/1888 -# Partial fix for: -# [Bug]: Test regressions in 20250512.0 on i686 -# https://github.com/abseil/abseil-cpp/issues/1887 -Patch: https://github.com/abseil/abseil-cpp/pull/1888.patch - -# Skip StackTrace.FixupNoFixupEquivalence on i386 -# Downstream-only, because it does not address the root cause: -# https://github.com/abseil/abseil-cpp/issues/1887 -Patch: 0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch - BuildRequires: cmake # The default make backend would work just as well; ninja is observably faster BuildRequires: ninja-build @@ -128,6 +116,10 @@ skips='^($.' # Fedora # https://github.com/abseil/abseil-cpp/issues/1804 skips="${skips}|absl_failure_signal_handler_test" +# [Bug]: StackTrace.NestedSignal in absl_stacktrace_test fails on ppc64le since +# 20250184.0 +# https://github.com/abseil/abseil-cpp/issues/1925 +skips="${skips}|absl_stacktrace_test" %endif skips="${skips})$" @@ -173,9 +165,11 @@ skips="${skips})$" %{_libdir}/libabsl_graphcycles_internal.so.%{lib_version} %{_libdir}/libabsl_hash.so.%{lib_version} %{_libdir}/libabsl_hashtablez_sampler.so.%{lib_version} +%{_libdir}/libabsl_hashtable_profiler.so.%{lib_version} %{_libdir}/libabsl_int128.so.%{lib_version} %{_libdir}/libabsl_kernel_timeout_internal.so.%{lib_version} %{_libdir}/libabsl_leak_check.so.%{lib_version} +%{_libdir}/libabsl_log_entry.so.%{lib_version} %{_libdir}/libabsl_log_flags.so.%{lib_version} %{_libdir}/libabsl_log_globals.so.%{lib_version} %{_libdir}/libabsl_log_initialize.so.%{lib_version} @@ -191,10 +185,10 @@ skips="${skips})$" %{_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} %{_libdir}/libabsl_malloc_internal.so.%{lib_version} %{_libdir}/libabsl_periodic_sampler.so.%{lib_version} %{_libdir}/libabsl_poison.so.%{lib_version} +%{_libdir}/libabsl_profile_builder.so.%{lib_version} %{_libdir}/libabsl_random_distributions.so.%{lib_version} %{_libdir}/libabsl_random_internal_distribution_test_util.so.%{lib_version} %{_libdir}/libabsl_random_internal_entropy_pool.so.%{lib_version} diff --git a/sources b/sources index d12175c..7217a9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abseil-cpp-20250512.1.tar.gz) = d3ba654ed7dd7b432494918b2de5d8e2b0ad1c42752c5d726f20d6fe2841828fb4e8beb853e3570a11efecef725029ce5ffa3ebc434efff007e7f60735eb9856 +SHA512 (abseil-cpp-20250814.0.tar.gz) = 4ee1a217203933382e728d354a149253a517150eee7580a0abecc69584b2eb200d91933ef424487e3a3fe0e8ab5e77b0288485cac982171b3585314a4417e7d4