Update to 20260526.0 (close RHBZ#2484429)
This commit is contained in:
parent
2677e884f7
commit
5d18935985
4 changed files with 52 additions and 4 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -22,3 +22,4 @@
|
|||
/abseil-cpp-20250814.1.tar.gz
|
||||
/abseil-cpp-20260107.0.tar.gz
|
||||
/abseil-cpp-20260107.1.tar.gz
|
||||
/abseil-cpp-20260526.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Installed library version
|
||||
%global lib_version 2601.0.0
|
||||
%global lib_version 2605.0.0
|
||||
|
||||
Name: abseil-cpp
|
||||
Version: 20260107.1
|
||||
Version: 20260526.0
|
||||
Release: %autorelease
|
||||
Summary: C++ Common Libraries
|
||||
|
||||
|
|
@ -30,6 +30,13 @@ Source: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-
|
|||
# https://github.com/abseil/abseil-cpp/issues/1992.
|
||||
Patch: 0001-Omit-the-bind-block-in-test-Test-Mutex-FunctorCondit.patch
|
||||
|
||||
# PR #2071: Include immintrin.h instead of bmi2intrin.h
|
||||
# https://github.com/abseil/abseil-cpp/commit/d851fdd768b27c02b3fb786fd0987faddd279ece
|
||||
#
|
||||
# Fixes failure to build with GCC 16 when the BMI2 extensions are enabled,
|
||||
# e.g., when targeting x86_64-v3 on ELN/RHEL.
|
||||
Patch: https://github.com/abseil/abseil-cpp/commit/d851fdd768b27c02b3fb786fd0987faddd279ece.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
# The default make backend would work just as well; ninja is observably faster
|
||||
BuildRequires: ninja-build
|
||||
|
|
@ -137,9 +144,9 @@ skips="${skips})$"
|
|||
# All shared libraries except installed TESTONLY libraries; see the %%files
|
||||
# list for the -testing subpackage for those.
|
||||
%{_libdir}/libabsl_base.so.%{lib_version}
|
||||
%{_libdir}/libabsl_borrowed_fixup_buffer.so.%{lib_version}
|
||||
%{_libdir}/libabsl_city.so.%{lib_version}
|
||||
%{_libdir}/libabsl_civil_time.so.%{lib_version}
|
||||
%{_libdir}/libabsl_clock_interface.so.%{lib_version}
|
||||
%{_libdir}/libabsl_cord.so.%{lib_version}
|
||||
%{_libdir}/libabsl_cord_internal.so.%{lib_version}
|
||||
%{_libdir}/libabsl_cordz_functions.so.%{lib_version}
|
||||
|
|
@ -211,9 +218,11 @@ skips="${skips})$"
|
|||
%{_libdir}/libabsl_raw_hash_set.so.%{lib_version}
|
||||
%{_libdir}/libabsl_raw_logging_internal.so.%{lib_version}
|
||||
%{_libdir}/libabsl_scoped_set_env.so.%{lib_version}
|
||||
%{_libdir}/libabsl_source_location.so.%{lib_version}
|
||||
%{_libdir}/libabsl_spinlock_wait.so.%{lib_version}
|
||||
%{_libdir}/libabsl_stacktrace.so.%{lib_version}
|
||||
%{_libdir}/libabsl_status.so.%{lib_version}
|
||||
%{_libdir}/libabsl_status_builder.so.%{lib_version}
|
||||
%{_libdir}/libabsl_statusor.so.%{lib_version}
|
||||
%{_libdir}/libabsl_str_format_internal.so.%{lib_version}
|
||||
%{_libdir}/libabsl_strerror.so.%{lib_version}
|
||||
|
|
@ -251,6 +260,7 @@ skips="${skips})$"
|
|||
# absl/synchronization/CMakeLists.txt
|
||||
%{_libdir}/libabsl_per_thread_sem_test_common.so.%{lib_version}
|
||||
# absl/time/CMakeLists.txt
|
||||
%{_libdir}/libabsl_simulated_clock.so.%{lib_version}
|
||||
%{_libdir}/libabsl_time_internal_test_util.so.%{lib_version}
|
||||
|
||||
%files devel
|
||||
|
|
|
|||
37
d851fdd768b27c02b3fb786fd0987faddd279ece.patch
Normal file
37
d851fdd768b27c02b3fb786fd0987faddd279ece.patch
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
From d851fdd768b27c02b3fb786fd0987faddd279ece Mon Sep 17 00:00:00 2001
|
||||
From: Ben Beasley <code@musicinmybrain.net>
|
||||
Date: Tue, 9 Jun 2026 08:48:33 -0700
|
||||
Subject: [PATCH] PR #2071: Include immintrin.h instead of bmi2intrin.h
|
||||
|
||||
Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/2071
|
||||
|
||||
GCC 16 produces an error when including `bmi2intrin.h` directly.
|
||||
|
||||
Merge 8ab6707df8ca3ea7263ae79930668de429ea2460 into acc35c318c4248b05ad85f6b7bbffd3c09bdfea7
|
||||
|
||||
Merging this change closes #2071
|
||||
|
||||
COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/2071 from musicinmybrain:bmi2intrin 8ab6707df8ca3ea7263ae79930668de429ea2460
|
||||
PiperOrigin-RevId: 929220314
|
||||
Change-Id: I0ac97e2e5c1016363579026ec8e7b4786e6531bd
|
||||
---
|
||||
absl/container/internal/raw_hash_set.h | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/absl/container/internal/raw_hash_set.h b/absl/container/internal/raw_hash_set.h
|
||||
index b99d987f23b..7119e103d77 100644
|
||||
--- a/absl/container/internal/raw_hash_set.h
|
||||
+++ b/absl/container/internal/raw_hash_set.h
|
||||
@@ -230,9 +230,9 @@
|
||||
#include <ranges> // NOLINT(build/c++20)
|
||||
#endif
|
||||
|
||||
-#ifdef __BMI2__
|
||||
-#include <bmi2intrin.h>
|
||||
-#endif // __BMI2__
|
||||
+#if defined(__i386__) || defined(__x86_64__)
|
||||
+#include <immintrin.h>
|
||||
+#endif
|
||||
|
||||
namespace absl {
|
||||
ABSL_NAMESPACE_BEGIN
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (abseil-cpp-20260107.1.tar.gz) = f5012885d6b6844a9cf5ed92ad5468b8757db33dfe1364bfb232fff928e06c550c7eb4557f45186a8ac4d18b178df9be267681abab4a6de40823b574afbe9960
|
||||
SHA512 (abseil-cpp-20260526.0.tar.gz) = fe85ebdd451b126117df1c3a312a1d5b29fc3557d07bb248854639b2a0180e91003fd2331a0d938f4ffeae8966f1df67a488fa3bdab072e840bbfdc6e8a4f01b
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue