update to 20220623.1

(cherry picked from commit c7b332bcb18172308feb9d40e0e9604d4d1896e9)
This commit is contained in:
xinghe 2022-11-02 02:10:39 +00:00 committed by openeuler-sync-bot
parent 7789e38ec3
commit dfd1610a26
4 changed files with 36 additions and 2 deletions

Binary file not shown.

Binary file not shown.

View File

@ -2,10 +2,10 @@
%undefine __cmake_in_source_build %undefine __cmake_in_source_build
# Installed library version # Installed library version
%global lib_version 2103.0.1 %global lib_version 2206.0.0
Name: abseil-cpp Name: abseil-cpp
Version: 20210324.2 Version: 20220623.1
Release: 1 Release: 1
Summary: C++ Common Libraries Summary: C++ Common Libraries
@ -13,6 +13,8 @@ License: ASL 2.0
URL: https://abseil.io URL: https://abseil.io
Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz 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: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: make BuildRequires: make
@ -61,5 +63,11 @@ Development headers for %{name}
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%changelog %changelog
* Wed Nov 02 2022 xinghe <xinghe2@h-partners.com> - 20220623.1-1
- Type:enhancement
- ID:NA
- SUG:NA
- DESC: update to 20220623.1
* Wed Jun 23 2021 gaihuiying <gaihuiying1@huawei.com> - 20210324.2-1 * Wed Jun 23 2021 gaihuiying <gaihuiying1@huawei.com> - 20210324.2-1
- package init - package init

View File

@ -0,0 +1,26 @@
From 09e96049995584c3489e4bd1467313e3e85af99c Mon Sep 17 00:00:00 2001
From: Bruno Pitrus <brunopitrus@hotmail.com>
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