diff --git a/abseil-cpp-20220623.1.tar.gz b/abseil-cpp-20220623.1.tar.gz deleted file mode 100644 index 492bcbc40c043e3a2a8388ac0e38008f7840fd93..0000000000000000000000000000000000000000 Binary files a/abseil-cpp-20220623.1.tar.gz and /dev/null differ diff --git a/abseil-cpp-20230125.2.tar.gz b/abseil-cpp-20230125.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..32935e45cdeb6fa772a636256c24fb2a9a91a145 Binary files /dev/null and b/abseil-cpp-20230125.2.tar.gz differ diff --git a/abseil-cpp.spec b/abseil-cpp.spec index c9eebf08097238a96228dafbdb142c50dc6c4535..7c2d65fb43f45ea1f7f7256c9f17dd46eed329ca 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -1,27 +1,29 @@ -# Force out of source build -%undefine __cmake_in_source_build - # Installed library version -%global lib_version 2206.0.0 +%global lib_version 2301.0.0 +%global current_builddir %{!?__cmake_in_source_build:.}%{?__cmake_in_source_build:.} + Name: abseil-cpp -Version: 20220623.1 -Release: 3 +Version: 20230125.2 +Release: 1 Summary: C++ Common Libraries 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 -Patch1: abseil-cpp-20210324.2-sw.patch +Patch0: abseil-cpp-20210324.2-sw.patch %ifarch loongarch64 Patch100: 0001-add-loongarch-suopport-for-abseil-cpp.patch %endif BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: make +BuildRequires: make ninja-build +# testing need +BuildRequires: gmock-devel gtest-devel + +Provides: bundled(cctz) %description Abseil is an open-source collection of C++ library code designed to augment @@ -42,18 +44,29 @@ and we now want to provide those resources to the C++ community as a whole. Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Conflicts: grpc < 1.31.0-5 +Provides: bundled(cctz) %description devel Development headers for %{name} %prep -%autosetup -p1 +%autosetup -p1 -S gendiff %build -%cmake +%cmake \ + %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \ + %{!?__cmake_in_source_build:-B "%{current_builddir}"} \ + -GNinja \ + -DABSL_USE_EXTERNAL_GOOGLETEST:BOOL=ON \ + -DABSL_FIND_GOOGLETEST:BOOL=ON \ + -DABSL_ENABLE_INSTALL:BOOL=ON +%__cmake --build "%{current_builddir}" %{?_smp_mflags} --verbose %install -%make_install +DESTDIR="%{buildroot}" %__cmake --install "%{current_builddir}" + +%check +ctest --test-dir "%{current_builddir}" --output-on-failure --force-new-ctest-process %{?_smp_mflags} %files %license LICENSE @@ -67,6 +80,12 @@ Development headers for %{name} %{_libdir}/pkgconfig/*.pc %changelog +* Wed Mar 01 2023 xinghe - 20230125.2-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: update to 20230125.2 + * Mon Nov 14 2022 Wenlong Zhang - 20220623.1-3 - add loongarch support for abseil-cpp diff --git a/backport-Do-not-leak-maes-msse4.1-into-pkgconfig.patch b/backport-Do-not-leak-maes-msse4.1-into-pkgconfig.patch deleted file mode 100644 index 94e79c3792ef9e4e0562b022b14ca7509ac27638..0000000000000000000000000000000000000000 --- a/backport-Do-not-leak-maes-msse4.1-into-pkgconfig.patch +++ /dev/null @@ -1,26 +0,0 @@ -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