diff --git a/abseil-cpp-20210324.2-sw.patch b/abseil-cpp-20210324.2-sw.patch old mode 100755 new mode 100644 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.3.tar.gz b/abseil-cpp-20230125.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..08a0c4a58d13f234bd3f1de6c73395ec5ab7d5f6 Binary files /dev/null and b/abseil-cpp-20230125.3.tar.gz differ diff --git a/abseil-cpp.spec b/abseil-cpp.spec index c9eebf08097238a96228dafbdb142c50dc6c4535..80eec9f5c47c397320a8a6a62dc58f45b79b7a70 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -2,24 +2,23 @@ %undefine __cmake_in_source_build # Installed library version -%global lib_version 2206.0.0 +%global lib_version 2301.0.0 Name: abseil-cpp -Version: 20220623.1 -Release: 3 +Version: 20230125.3 +Release: 1 Summary: C++ Common Libraries -License: ASL 2.0 +License: Apache-2.0 AND LicenseRef-Fedora-Public-Domain 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 %ifarch loongarch64 Patch100: 0001-add-loongarch-suopport-for-abseil-cpp.patch %endif -BuildRequires: cmake +BuildRequires: cmake ninja-build BuildRequires: gcc-c++ BuildRequires: make @@ -50,15 +49,103 @@ Development headers for %{name} %autosetup -p1 %build -%cmake +%cmake -S %{_vpath_srcdir} -B %{_vpath_builddir} -GNinja \ + -DCMAKE_BUILD_TYPE:STRING=None \ + -DCMAKE_CXX_STANDARD:STRING=17 + +%__cmake --build %{_vpath_builddir} %{?_smp_mflags} --verbose %install -%make_install +DESTDIR="%{buildroot}" %__cmake --install "%{_vpath_builddir}" %files %license LICENSE %doc FAQ.md README.md UPGRADES.md -%{_libdir}/libabsl_*.so.%{lib_version} +# All shared libraries except installed TESTONLY libraries; see the %%files +# list for the -testing subpackage for those. +%{_libdir}/libabsl_bad_any_cast_impl.so.%{lib_version} +%{_libdir}/libabsl_bad_optional_access.so.%{lib_version} +%{_libdir}/libabsl_bad_variant_access.so.%{lib_version} +%{_libdir}/libabsl_base.so.%{lib_version} +%{_libdir}/libabsl_city.so.%{lib_version} +%{_libdir}/libabsl_civil_time.so.%{lib_version} +%{_libdir}/libabsl_cord.so.%{lib_version} +%{_libdir}/libabsl_cord_internal.so.%{lib_version} +%{_libdir}/libabsl_cordz_functions.so.%{lib_version} +%{_libdir}/libabsl_cordz_handle.so.%{lib_version} +%{_libdir}/libabsl_cordz_info.so.%{lib_version} +%{_libdir}/libabsl_cordz_sample_token.so.%{lib_version} +%{_libdir}/libabsl_crc32c.so.%{lib_version} +%{_libdir}/libabsl_crc_cord_state.so.%{lib_version} +%{_libdir}/libabsl_crc_cpu_detect.so.%{lib_version} +%{_libdir}/libabsl_crc_internal.so.%{lib_version} +%{_libdir}/libabsl_debugging_internal.so.%{lib_version} +%{_libdir}/libabsl_demangle_internal.so.%{lib_version} +%{_libdir}/libabsl_die_if_null.so.%{lib_version} +%{_libdir}/libabsl_examine_stack.so.%{lib_version} +%{_libdir}/libabsl_exponential_biased.so.%{lib_version} +%{_libdir}/libabsl_failure_signal_handler.so.%{lib_version} +%{_libdir}/libabsl_flags.so.%{lib_version} +%{_libdir}/libabsl_flags_commandlineflag.so.%{lib_version} +%{_libdir}/libabsl_flags_commandlineflag_internal.so.%{lib_version} +%{_libdir}/libabsl_flags_config.so.%{lib_version} +%{_libdir}/libabsl_flags_internal.so.%{lib_version} +%{_libdir}/libabsl_flags_marshalling.so.%{lib_version} +%{_libdir}/libabsl_flags_parse.so.%{lib_version} +%{_libdir}/libabsl_flags_private_handle_accessor.so.%{lib_version} +%{_libdir}/libabsl_flags_program_name.so.%{lib_version} +%{_libdir}/libabsl_flags_reflection.so.%{lib_version} +%{_libdir}/libabsl_flags_usage.so.%{lib_version} +%{_libdir}/libabsl_flags_usage_internal.so.%{lib_version} +%{_libdir}/libabsl_graphcycles_internal.so.%{lib_version} +%{_libdir}/libabsl_hash.so.%{lib_version} +%{_libdir}/libabsl_hashtablez_sampler.so.%{lib_version} +%{_libdir}/libabsl_int128.so.%{lib_version} +%{_libdir}/libabsl_leak_check.so.%{lib_version} +%{_libdir}/libabsl_log_entry.so.%{lib_version} +%{_libdir}/libabsl_log_flags.so.%{lib_version} +%{_libdir}/libabsl_log_globals.so.%{lib_version} +%{_libdir}/libabsl_log_initialize.so.%{lib_version} +%{_libdir}/libabsl_log_internal_check_op.so.%{lib_version} +%{_libdir}/libabsl_log_internal_conditions.so.%{lib_version} +%{_libdir}/libabsl_log_internal_format.so.%{lib_version} +%{_libdir}/libabsl_log_internal_globals.so.%{lib_version} +%{_libdir}/libabsl_log_internal_log_sink_set.so.%{lib_version} +%{_libdir}/libabsl_log_internal_message.so.%{lib_version} +%{_libdir}/libabsl_log_internal_nullguard.so.%{lib_version} +%{_libdir}/libabsl_log_internal_proto.so.%{lib_version} +%{_libdir}/libabsl_log_severity.so.%{lib_version} +%{_libdir}/libabsl_log_sink.so.%{lib_version} +%{_libdir}/libabsl_low_level_hash.so.%{lib_version} +%{_libdir}/libabsl_malloc_internal.so.%{lib_version} +%{_libdir}/libabsl_periodic_sampler.so.%{lib_version} +%{_libdir}/libabsl_random_distributions.so.%{lib_version} +%{_libdir}/libabsl_random_internal_distribution_test_util.so.%{lib_version} +%{_libdir}/libabsl_random_internal_platform.so.%{lib_version} +%{_libdir}/libabsl_random_internal_pool_urbg.so.%{lib_version} +%{_libdir}/libabsl_random_internal_randen.so.%{lib_version} +%{_libdir}/libabsl_random_internal_randen_hwaes.so.%{lib_version} +%{_libdir}/libabsl_random_internal_randen_hwaes_impl.so.%{lib_version} +%{_libdir}/libabsl_random_internal_randen_slow.so.%{lib_version} +%{_libdir}/libabsl_random_internal_seed_material.so.%{lib_version} +%{_libdir}/libabsl_random_seed_gen_exception.so.%{lib_version} +%{_libdir}/libabsl_random_seed_sequences.so.%{lib_version} +%{_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_spinlock_wait.so.%{lib_version} +%{_libdir}/libabsl_stacktrace.so.%{lib_version} +%{_libdir}/libabsl_status.so.%{lib_version} +%{_libdir}/libabsl_statusor.so.%{lib_version} +%{_libdir}/libabsl_str_format_internal.so.%{lib_version} +%{_libdir}/libabsl_strerror.so.%{lib_version} +%{_libdir}/libabsl_strings.so.%{lib_version} +%{_libdir}/libabsl_strings_internal.so.%{lib_version} +%{_libdir}/libabsl_symbolize.so.%{lib_version} +%{_libdir}/libabsl_synchronization.so.%{lib_version} +%{_libdir}/libabsl_throw_delegate.so.%{lib_version} +%{_libdir}/libabsl_time.so.%{lib_version} +%{_libdir}/libabsl_time_zone.so.%{lib_version} %files devel %{_includedir}/absl @@ -67,6 +154,12 @@ Development headers for %{name} %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jul 27 2023 gaihuiying - 20230125.3-1 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:update to 20230125.3 + * 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