diff --git a/.gitignore b/.gitignore index 7616849..1d9c899 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /abseil-cpp-20240722.1.tar.gz /abseil-cpp-20250127.0.tar.gz /abseil-cpp-20250127.1.tar.gz +/abseil-cpp-20250512.0.tar.gz diff --git a/0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch b/0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch new file mode 100644 index 0000000..a3346ce --- /dev/null +++ b/0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch @@ -0,0 +1,27 @@ +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 new file mode 100644 index 0000000..719de6d --- /dev/null +++ b/1888.patch @@ -0,0 +1,24 @@ +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 73bbe74..b963581 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -1,8 +1,8 @@ # Installed library version -%global lib_version 2501.0.0 +%global lib_version 2505.0.0 Name: abseil-cpp -Version: 20250127.1 +Version: 20250512.0 Release: 1%{?dist} Summary: C++ Common Libraries @@ -24,15 +24,17 @@ 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 -# 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 +# 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 @@ -136,9 +138,6 @@ skips="${skips})$" %doc FAQ.md README.md UPGRADES.md # All shared libraries except installed TESTONLY libraries; see the %%files # list for the -testing subpackage for those. -%{_libdir}/libabsl_bad_any_cast_impl.so.%{lib_version} -%{_libdir}/libabsl_bad_optional_access.so.%{lib_version} -%{_libdir}/libabsl_bad_variant_access.so.%{lib_version} %{_libdir}/libabsl_base.so.%{lib_version} %{_libdir}/libabsl_city.so.%{lib_version} %{_libdir}/libabsl_civil_time.so.%{lib_version} @@ -177,7 +176,6 @@ skips="${skips})$" %{_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} @@ -199,8 +197,8 @@ skips="${skips})$" %{_libdir}/libabsl_poison.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} %{_libdir}/libabsl_random_internal_platform.so.%{lib_version} -%{_libdir}/libabsl_random_internal_pool_urbg.so.%{lib_version} %{_libdir}/libabsl_random_internal_randen.so.%{lib_version} %{_libdir}/libabsl_random_internal_randen_hwaes.so.%{lib_version} %{_libdir}/libabsl_random_internal_randen_hwaes_impl.so.%{lib_version} @@ -261,6 +259,9 @@ skips="${skips})$" %{_libdir}/pkgconfig/absl_*.pc %changelog +* Thu May 15 2025 Benjamin A. Beasley - 20250512.0-1 +- Update to 20250512.0 (close RHBZ#2366373) + * Wed Mar 19 2025 Benjamin A. Beasley - 20250127.1-1 - Update to 20250127.1 (close RHBZ#2353223) diff --git a/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch b/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch deleted file mode 100644 index e0142b0..0000000 --- a/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 b7b41ac..51b3a8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abseil-cpp-20250127.1.tar.gz) = 8312acf0ed74fa28c6397f3e41ada656dbd5ca2bf8db484319d74b144ad19c0ebdc77f7f03436be6c6ca1cde706b9055079233cf0d6b5ada4ca48406f8a55dd8 +SHA512 (abseil-cpp-20250512.0.tar.gz) = 92542db666e0c628cf56bf8ad09412af9c8b622e4f26e72d1e1b092ceec430a5c105f6561e2d9983af565f55da07f67e770cafe373b20cc4cb29a893a6a236fc