From 43dbd51a5643afe961093c01988ce257dc55ad2e Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 14 Feb 2022 22:08:50 +0100 Subject: [PATCH 1/1] - updated to 20211102.0 (new LTS, new sonames) - ensure C++17 (with std::string_view) --- abseil-cpp.spec | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/abseil-cpp.spec b/abseil-cpp.spec index 9f695c7..fe2be2c 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -5,18 +5,21 @@ Summary: Abseil - C++ common libraries Summary(pl.UTF-8): Abseil - wspólne biblioteki C++ Name: abseil-cpp -Version: 20210324.2 +Version: 20211102.0 Release: 1 License: Apache v2.0 Group: Libraries #Source0Download: https://github.com/abseil/abseil-cpp/releases -Source0: https://github.com/abseil/abseil-cpp/archive/refs/tags/%{version}.tar.gz -# Source0-md5: e0b585398b89ee92a10d8c68ef7eed48 +Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz +# Source0-md5: bdca561519192543378b7cade101ec43 URL: https://abseil.io/ -BuildRequires: cmake >= 3.5 -BuildRequires: libstdc++-devel >= 6:4.7 +BuildRequires: cmake >= 3.8 +BuildRequires: libstdc++-devel >= 6:7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +# refers to _ZN4absl12lts_2021110213cord_internal17cordz_next_sampleE non-function symb ol from libabsl_condz_functions +%define skip_post_check_so libabsl_cord.so.* + %description Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected @@ -34,7 +37,7 @@ Summary: Header files for Abseil libraries Summary(pl.UTF-8): Pliki nagłówkowe bibliotek Abseil Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libstdc++-devel >= 6:4.7 +Requires: libstdc++-devel >= 6:7 %description devel Header files for Abseil libraries. @@ -62,7 +65,9 @@ Statyczne biblioteki Abseil. install -d build-static cd build-static %cmake .. \ - -DBUILD_SHARED_LIBS=OFF + -DABSL_PROPAGATE_CXX_STD=ON \ + -DBUILD_SHARED_LIBS=OFF \ + -DCMAKE_CXX_STANDARD=17 %{__make} cd .. @@ -70,7 +75,9 @@ cd .. install -d build cd build -%cmake .. +%cmake .. \ + -DABSL_PROPAGATE_CXX_STD=ON \ + -DCMAKE_CXX_STANDARD=17 %{__make} -- 2.44.0