diff --git a/abseil-cpp-20210324.2.tar.gz b/abseil-cpp-20210324.2.tar.gz deleted file mode 100644 index 57dbb8dcf7a445a306553fa55df11ee2d9d2e61a..0000000000000000000000000000000000000000 Binary files a/abseil-cpp-20210324.2.tar.gz and /dev/null differ diff --git a/abseil-cpp-20220623.1.tar.gz b/abseil-cpp-20220623.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..492bcbc40c043e3a2a8388ac0e38008f7840fd93 Binary files /dev/null and b/abseil-cpp-20220623.1.tar.gz differ diff --git a/abseil-cpp.spec b/abseil-cpp.spec index fceb2d0699254c0ed55ad2469e564bd49de898c7..d7f418432ca84b1f762de2c8c7bbd6a865e6baad 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -2,10 +2,10 @@ %undefine __cmake_in_source_build # Installed library version -%global lib_version 2103.0.1 +%global lib_version 2206.0.0 Name: abseil-cpp -Version: 20210324.2 +Version: 20220623.1 Release: 1 Summary: C++ Common Libraries @@ -13,6 +13,8 @@ License: ASL 2.0 URL: https://abseil.io Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: backport-Do-not-leak-maes-msse4.1-into-pkgconfig.patch + BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: make @@ -61,5 +63,11 @@ Development headers for %{name} %{_libdir}/pkgconfig/*.pc %changelog +* Wed Nov 02 2022 xinghe - 20220623.1-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: update to 20220623.1 + * Wed Jun 23 2021 gaihuiying - 20210324.2-1 - package init diff --git a/backport-Do-not-leak-maes-msse4.1-into-pkgconfig.patch b/backport-Do-not-leak-maes-msse4.1-into-pkgconfig.patch new file mode 100644 index 0000000000000000000000000000000000000000..94e79c3792ef9e4e0562b022b14ca7509ac27638 --- /dev/null +++ b/backport-Do-not-leak-maes-msse4.1-into-pkgconfig.patch @@ -0,0 +1,26 @@ +From 09e96049995584c3489e4bd1467313e3e85af99c Mon Sep 17 00:00:00 2001 +From: Bruno Pitrus +Date: Mon, 11 Jul 2022 18:27:39 +0200 +Subject: [PATCH] Do not leak -maes -msse4.1 into pkgconfig + +Conflict: NA +Reference: https://github.com/abseil/abseil-cpp/commit/09e96049995584c3489e4bd1467313e3e85af99c +--- + CMake/AbseilHelpers.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake +index ebe9ddc8..9cd87c51 100644 +--- a/CMake/AbseilHelpers.cmake ++++ b/CMake/AbseilHelpers.cmake +@@ -166,6 +166,8 @@ function(absl_cc_library) + set(PC_CFLAGS "${PC_CFLAGS} ${cflag}") + elseif(${cflag} MATCHES "^(-W|/w[1234eo])") + # Don't impose our warnings on others. ++ elseif(${cflag} MATCHES "^-m") ++ # Don't impose CPU instruction requirements on others, as the code performs feature detection on runtime. + else() + set(PC_CFLAGS "${PC_CFLAGS} ${cflag}") + endif() +-- +2.33.0