Accepting request 1227605 from devel:microos
OBS-URL: https://build.opensuse.org/request/show/1227605 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/abseil-cpp?expand=0&rev=40
This commit is contained in:
commit
40c237a55f
@ -1,26 +0,0 @@
|
|||||||
From 779a3565ac6c5b69dd1ab9183e500a27633117d5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Derek Mauro <dmauro@google.com>
|
|
||||||
Date: Tue, 30 Jan 2024 10:13:25 -0800
|
|
||||||
Subject: [PATCH] Avoid export of testonly target absl::test_allocator in CMake
|
|
||||||
builds
|
|
||||||
|
|
||||||
Closes #1536
|
|
||||||
|
|
||||||
PiperOrigin-RevId: 602764437
|
|
||||||
Change-Id: Ia5c20a3874262a2ddb8797f608af17d7e86dd6d6
|
|
||||||
---
|
|
||||||
absl/container/CMakeLists.txt | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt
|
|
||||||
index 449a2cad17e..ee9ca9c3c4a 100644
|
|
||||||
--- a/absl/container/CMakeLists.txt
|
|
||||||
+++ b/absl/container/CMakeLists.txt
|
|
||||||
@@ -213,6 +213,7 @@ absl_cc_library(
|
|
||||||
DEPS
|
|
||||||
absl::config
|
|
||||||
GTest::gmock
|
|
||||||
+ TESTONLY
|
|
||||||
)
|
|
||||||
|
|
||||||
absl_cc_test(
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc
|
|
||||||
size 2151288
|
|
3
abseil-cpp-20240722.0.tar.gz
Normal file
3
abseil-cpp-20240722.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3
|
||||||
|
size 2242861
|
@ -1,3 +1,26 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Nov 16 22:20:54 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||||
|
|
||||||
|
- update to 20240722.0:
|
||||||
|
* Add GoogleTest matchers for absl::Status. These matchers make
|
||||||
|
it easier to write unit tests for code that uses absl::Status.
|
||||||
|
* absl::AlphaNum no longer allows brace-initialization
|
||||||
|
* The deprecated symbol absl::kuint128max has been removed and
|
||||||
|
should be replaced with absl::Uint128Max().
|
||||||
|
* absl::aligned_storage_t, which was a polyfill consistent with
|
||||||
|
std::aligned_storage_t, has been removed.
|
||||||
|
std::aligned_storage_t is deprecated in C++23
|
||||||
|
* absl::StrJoin now has a absl::string_view overload. This
|
||||||
|
allows for passing a collection of string-like objects without
|
||||||
|
having to convert everything to the same type first. However,
|
||||||
|
this may be a breaking change for users passing an explicit
|
||||||
|
template argument to absl::StrJoin. In this case, simply remove
|
||||||
|
the explicit template parameter.
|
||||||
|
* vlog_is_on.h is now a public header and is no longer included
|
||||||
|
from log.h. To use VLOG_IS_ON(), absl/log/vlog_is_on.h must be
|
||||||
|
included.
|
||||||
|
- drop abseil-cmake-gtest-testonly.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jul 5 21:27:25 UTC 2024 - Christoph G <foss@grueninger.de>
|
Fri Jul 5 21:27:25 UTC 2024 - Christoph G <foss@grueninger.de>
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
# spec file for package abseil-cpp
|
# spec file for package abseil-cpp
|
||||||
#
|
#
|
||||||
# Copyright (c) 2024 SUSE LLC
|
# Copyright (c) 2024 SUSE LLC
|
||||||
|
# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -16,18 +17,18 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%global soversion so.2401.0.0
|
%global soversion so.2407.0.0
|
||||||
%global lname_suffix 2401_0_0
|
%global lname_suffix 2407_0_0
|
||||||
%if 0%{?gcc_version} < 7
|
%if 0%{?gcc_version} < 7
|
||||||
%global with_gcc 7
|
%global with_gcc 7
|
||||||
%endif
|
%endif
|
||||||
Name: abseil-cpp
|
Name: abseil-cpp
|
||||||
Version: 20240116.2
|
Version: 20240722.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: C++11 libraries which augment the C++ stdlib
|
Summary: C++11 libraries which augment the C++ stdlib
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
URL: https://abseil.io/
|
URL: https://abseil.io/
|
||||||
Source0: https://github.com/abseil/%{name}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source0: https://github.com/abseil/abseil-cpp/releases/download/%{version}/%{name}-%{version}.tar.gz
|
||||||
Source1: baselibs.conf
|
Source1: baselibs.conf
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -41,8 +42,6 @@ Patch1: cmake.patch
|
|||||||
%else
|
%else
|
||||||
Patch0: options-cxx17.patch
|
Patch0: options-cxx17.patch
|
||||||
%endif
|
%endif
|
||||||
# upstream patch to prevent GTest error with CMake 3.30
|
|
||||||
Patch2: abseil-cmake-gtest-testonly.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Abseil is a collection of C++11 libraries which augment the C++
|
Abseil is a collection of C++11 libraries which augment the C++
|
||||||
@ -166,6 +165,8 @@ export CXX="g++-%{with_gcc}"
|
|||||||
%{_libdir}/libabsl_civil_time.%{soversion}
|
%{_libdir}/libabsl_civil_time.%{soversion}
|
||||||
%{_libdir}/libabsl_cordz_sample_token.%{soversion}
|
%{_libdir}/libabsl_cordz_sample_token.%{soversion}
|
||||||
%{_libdir}/libabsl_crc_cpu_detect.%{soversion}
|
%{_libdir}/libabsl_crc_cpu_detect.%{soversion}
|
||||||
|
%{_libdir}/libabsl_decode_rust_punycode.%{soversion}
|
||||||
|
%{_libdir}/libabsl_demangle_rust.%{soversion}
|
||||||
%{_libdir}/libabsl_die_if_null.%{soversion}
|
%{_libdir}/libabsl_die_if_null.%{soversion}
|
||||||
%{_libdir}/libabsl_failure_signal_handler.%{soversion}
|
%{_libdir}/libabsl_failure_signal_handler.%{soversion}
|
||||||
%{_libdir}/libabsl_flags_commandlineflag_internal.%{soversion}
|
%{_libdir}/libabsl_flags_commandlineflag_internal.%{soversion}
|
||||||
@ -189,6 +190,7 @@ export CXX="g++-%{with_gcc}"
|
|||||||
%{_libdir}/libabsl_log_internal_fnmatch.%{soversion}
|
%{_libdir}/libabsl_log_internal_fnmatch.%{soversion}
|
||||||
%{_libdir}/libabsl_log_severity.%{soversion}
|
%{_libdir}/libabsl_log_severity.%{soversion}
|
||||||
%{_libdir}/libabsl_periodic_sampler.%{soversion}
|
%{_libdir}/libabsl_periodic_sampler.%{soversion}
|
||||||
|
%{_libdir}/libabsl_poison.%{soversion}
|
||||||
%{_libdir}/libabsl_random_distributions.%{soversion}
|
%{_libdir}/libabsl_random_distributions.%{soversion}
|
||||||
%{_libdir}/libabsl_random_internal_distribution_test_util.%{soversion}
|
%{_libdir}/libabsl_random_internal_distribution_test_util.%{soversion}
|
||||||
%{_libdir}/libabsl_random_internal_platform.%{soversion}
|
%{_libdir}/libabsl_random_internal_platform.%{soversion}
|
||||||
@ -203,6 +205,7 @@ export CXX="g++-%{with_gcc}"
|
|||||||
%{_libdir}/libabsl_scoped_set_env.%{soversion}
|
%{_libdir}/libabsl_scoped_set_env.%{soversion}
|
||||||
%{_libdir}/libabsl_statusor.%{soversion}
|
%{_libdir}/libabsl_statusor.%{soversion}
|
||||||
%{_libdir}/libabsl_status.%{soversion}
|
%{_libdir}/libabsl_status.%{soversion}
|
||||||
|
%{_libdir}/libabsl_utf8_for_code_point.%{soversion}
|
||||||
%{_libdir}/libabsl_vlog_config_internal.%{soversion}
|
%{_libdir}/libabsl_vlog_config_internal.%{soversion}
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
libabsl_lite_2401_0_0
|
libabsl_lite_2407_0_0
|
||||||
libabsl_2401_0_0
|
libabsl_2407_0_0
|
||||||
|
14
cmake.patch
14
cmake.patch
@ -1,11 +1,13 @@
|
|||||||
--- abseil-cpp-20230125.3/CMakeLists.txt 2023-08-08 13:05:37.796998429 +0200
|
Index: abseil-cpp-20240722.0/CMakeLists.txt
|
||||||
+++ abseil-cpp-20230125.3/CMakeLists.txt 2023-08-08 13:06:11.263885421 +0200
|
===================================================================
|
||||||
|
--- abseil-cpp-20240722.0.orig/CMakeLists.txt
|
||||||
|
+++ abseil-cpp-20240722.0/CMakeLists.txt
|
||||||
@@ -16,7 +16,7 @@
|
@@ -16,7 +16,7 @@
|
||||||
|
|
||||||
# https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md
|
# https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md
|
||||||
# As of 2022-09-06, CMake 3.10 is the minimum supported version.
|
# As of 2024-07-01, CMake 3.16 is the minimum supported version.
|
||||||
-cmake_minimum_required(VERSION 3.10)
|
-cmake_minimum_required(VERSION 3.16)
|
||||||
+cmake_minimum_required(VERSION 3.5)
|
+cmake_minimum_required(VERSION 3.5)
|
||||||
|
|
||||||
# Compiler id for Apple Clang is now AppleClang.
|
# Allow the user to specify the CMAKE_MSVC_DEBUG_INFORMATION_FORMAT
|
||||||
if (POLICY CMP0025)
|
if (POLICY CMP0141)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user