12 Commits

Author SHA256 Message Date
f3d5ef3f97 Accepting request 1287037 from devel:microos
OBS-URL: https://build.opensuse.org/request/show/1287037
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/abseil-cpp?expand=0&rev=47
2025-06-23 12:50:39 +00:00
c69d463b93 Accepting request 1286738 from home:AndreasStieger:branches:devel:microos
abseil-cpp 20250512.1

OBS-URL: https://build.opensuse.org/request/show/1286738
OBS-URL: https://build.opensuse.org/package/show/devel:microos/abseil-cpp?expand=0&rev=55
2025-06-20 05:09:45 +00:00
daa84f9654 Accepting request 1280742 from home:AndreasStieger:branches:devel:microos
fixup

OBS-URL: https://build.opensuse.org/request/show/1280742
OBS-URL: https://build.opensuse.org/package/show/devel:microos/abseil-cpp?expand=0&rev=54
2025-06-04 08:06:50 +00:00
aec6f87c70 Accepting request 1279911 from home:AndreasStieger:factory
abseil-cpp 20250512.0

Needs changes to protobuf, see source project

OBS-URL: https://build.opensuse.org/request/show/1279911
OBS-URL: https://build.opensuse.org/package/show/devel:microos/abseil-cpp?expand=0&rev=53
2025-05-28 05:13:07 +00:00
4213a1ff6e Accepting request 1274319 from devel:microos
OBS-URL: https://build.opensuse.org/request/show/1274319
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/abseil-cpp?expand=0&rev=46
2025-05-06 14:38:45 +00:00
a890fe5f6c add upstream to avoid gcc15 deprecation warnings that result in build failure of dependant packages
OBS-URL: https://build.opensuse.org/package/show/devel:microos/abseil-cpp?expand=0&rev=51
2025-05-05 05:54:33 +00:00
d850706f4e Accepting request 1255599 from devel:microos
OBS-URL: https://build.opensuse.org/request/show/1255599
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/abseil-cpp?expand=0&rev=45
2025-03-26 20:16:24 +00:00
Richard Brown
33b01ad463 Accepting request 1255337 from home:AndreasStieger:branches:devel:microos
abseil-cpp 20250127.1 boo#1236438

OBS-URL: https://build.opensuse.org/request/show/1255337
OBS-URL: https://build.opensuse.org/package/show/devel:microos/abseil-cpp?expand=0&rev=49
2025-03-24 11:45:32 +00:00
33e55feeee Accepting request 1246551 from devel:microos
OBS-URL: https://build.opensuse.org/request/show/1246551
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/abseil-cpp?expand=0&rev=44
2025-02-18 18:08:54 +00:00
b89b52cd51 - do not obsolete the shared libary package
OBS-URL: https://build.opensuse.org/package/show/devel:microos/abseil-cpp?expand=0&rev=47
2025-02-18 06:00:37 +00:00
5addd698c3 Accepting request 1245084 from devel:microos
OBS-URL: https://build.opensuse.org/request/show/1245084
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/abseil-cpp?expand=0&rev=43
2025-02-11 20:20:11 +00:00
Richard Brown
2dd36bd49e abseil-cpp 20250127.0
OBS-URL: https://build.opensuse.org/package/show/devel:microos/abseil-cpp?expand=0&rev=45
2025-02-11 11:59:07 +00:00
8 changed files with 194 additions and 261 deletions

BIN
abseil-cpp-20240722.1.tar.gz (Stored with Git LFS)

Binary file not shown.

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b7a064305e9fd94d124ffa6cc358592eb42b5da588fb4e07d09254aa40086db
size 2221441

View File

@@ -1,3 +1,64 @@
-------------------------------------------------------------------
Wed Jun 18 15:35:54 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
- update to 20250512.1:
* Fix conditional constexpr in ToInt64{Nano|Micro|Milli}seconds
under GCC7 and GCC8 using an else clause as a workaround
* Fix -Wundef warning
-------------------------------------------------------------------
Sun May 25 11:21:56 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
- update to 20250512.0:
* The polyfill types absl::any, absl::optional, and absl::variant
are now aliases for std::any, std::optional, and std::variant
in all builds.
* Added absl::FastTypeId<Type>(), which evaluates at compile-time
to a unique id for the passed-in type.
* Added absl::endian and absl::byteswap polyfills
* Nullability template types are deprecated and will be removed
in a future release. The macro-style annotations (absl_nonnull,
absl_nullable) should be used instead
- drop abseil-ciso646.patch, included upstream
- Now requires C++17. Switch to gcc12 on Leap 15.x and drop
options-old.patch and cmake.patch there.
- It seems futile to keep the separation between the lite and the
library package clean, not even internally or for the intended
purpose of aligning with protobuf. Split into single packages per
library and automate.
-------------------------------------------------------------------
Fri May 2 16:08:03 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
- add abseil-ciso646.patch from upstream to avoid gcc15 deprecation
warnings that result in build failure of dependant packages
-------------------------------------------------------------------
Sat Mar 22 22:02:43 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
- Update to 20250127.1:
* Improved Bazel support
* Added ABSL_ATTRIBUTE_VIEW and ABSL_ATTRIBUTE_OWNER for
diagnosing certain lifetime issues
* Many performance improvements
* potential integer overflow in hash container create/resize
fixed again - boo#1236438
-------------------------------------------------------------------
Mon Feb 17 18:35:03 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
- do not obsolete the shared libary package
-------------------------------------------------------------------
Sat Feb 8 10:07:18 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
- update to 20250127.0
* Added support for Bazel 8.0
* Added support for Bazel Platforms for better portability
* Added ABSL_ATTRIBUTE_VIEW and ABSL_ATTRIBUTE_OWNER for
diagnosing certain lifetime issues
* Many performance improvements
-------------------------------------------------------------------
Sun Jan 26 18:31:46 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>

View File

@@ -1,7 +1,7 @@
#
# spec file for package abseil-cpp
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
#
# All modifications and additions to the file contributed by third parties
@@ -17,77 +17,153 @@
#
%global soversion so.2407.0.0
%global lname_suffix 2407_0_0
%if 0%{?gcc_version} < 7
%global with_gcc 7
%endif
%global soversion so.2505.0.0
%global lname_suffix 2505_0_0
Name: abseil-cpp
Version: 20240722.1
Version: 20250512.1
Release: 0
Summary: C++11 libraries which augment the C++ stdlib
Summary: C++ libraries which augment the C++ stdlib
License: Apache-2.0
URL: https://abseil.io/
Source0: https://github.com/abseil/abseil-cpp/releases/download/%{version}/%{name}-%{version}.tar.gz
Source1: baselibs.conf
Patch0: options-cxx17.patch
BuildRequires: c++_compiler
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc%{?with_gcc}
BuildRequires: gcc%{?with_gcc}-c++
BuildRequires: pkgconfig
# PATCH-FIX-OPENSUSE options-{old,cxx17}.patch Ensure ABI stability regardless of compiler options
%if 0%{?suse_version} && 0%{?suse_version} < 1550
Patch0: options-old.patch
Patch1: cmake.patch
%else
Patch0: options-cxx17.patch
%if 0%{?suse_version} < 1600
BuildRequires: gcc12-c++
%endif
%description
Abseil is a collection of C++11 libraries which augment the C++
standard library. It also provides features incorporated into C++14
and C++17 standards.
Abseil is a collection of C++ libraries which augment the C++ standard
library. It also provides features incorporated into later C++ standards.
%package -n libabsl_lite_%{lname_suffix}
Summary: C++11 libraries which augment the C++ stdlib - lite
Obsoletes: abseil-cpp < %{version}-%{release}
Provides: abseil-cpp = %{version}-%{release}
%description -n libabsl_lite_%{lname_suffix}
Abseil is a collection of C++11 libraries which augment the C++
standard library. It also provides features incorporated into C++14
and C++17 standards.
This package provides the subset needed by protobuf-lite.
%package -n libabsl_%{lname_suffix}
Summary: C++11 libraries which augment the C++ stdlib - others
Obsoletes: abseil-cpp < %{version}-%{release}
Obsoletes: libabsl2401_0_0 < %{version}-%{release}
Provides: abseil-cpp = %{version}-%{release}
%description -n libabsl_%{lname_suffix}
Abseil is a collection of C++11 libraries which augment the C++
standard library. It also provides features incorporated into C++14
and C++17 standards.
%define abseil_libs \
%abseil_libpackage -l libabsl_base \
%abseil_libpackage -l libabsl_city \
%abseil_libpackage -l libabsl_civil_time \
%abseil_libpackage -l libabsl_cord \
%abseil_libpackage -l libabsl_cord_internal \
%abseil_libpackage -l libabsl_cordz_functions \
%abseil_libpackage -l libabsl_cordz_handle \
%abseil_libpackage -l libabsl_cordz_info \
%abseil_libpackage -l libabsl_cordz_sample_token \
%abseil_libpackage -l libabsl_crc32c \
%abseil_libpackage -l libabsl_crc_cord_state \
%abseil_libpackage -l libabsl_crc_cpu_detect \
%abseil_libpackage -l libabsl_crc_internal \
%abseil_libpackage -l libabsl_debugging_internal \
%abseil_libpackage -l libabsl_decode_rust_punycode \
%abseil_libpackage -l libabsl_demangle_internal \
%abseil_libpackage -l libabsl_demangle_rust \
%abseil_libpackage -l libabsl_die_if_null \
%abseil_libpackage -l libabsl_examine_stack \
%abseil_libpackage -l libabsl_exponential_biased \
%abseil_libpackage -l libabsl_failure_signal_handler \
%abseil_libpackage -l libabsl_flags_commandlineflag \
%abseil_libpackage -l libabsl_flags_commandlineflag_internal \
%abseil_libpackage -l libabsl_flags_config \
%abseil_libpackage -l libabsl_flags_internal \
%abseil_libpackage -l libabsl_flags_marshalling \
%abseil_libpackage -l libabsl_flags_parse \
%abseil_libpackage -l libabsl_flags_private_handle_accessor \
%abseil_libpackage -l libabsl_flags_program_name \
%abseil_libpackage -l libabsl_flags_reflection \
%abseil_libpackage -l libabsl_flags_usage \
%abseil_libpackage -l libabsl_flags_usage_internal \
%abseil_libpackage -l libabsl_graphcycles_internal \
%abseil_libpackage -l libabsl_hash \
%abseil_libpackage -l libabsl_hashtablez_sampler \
%abseil_libpackage -l libabsl_int128 -d \-\
%abseil_libpackage -l libabsl_kernel_timeout_internal \
%abseil_libpackage -l libabsl_leak_check \
%abseil_libpackage -l libabsl_log_flags \
%abseil_libpackage -l libabsl_log_globals \
%abseil_libpackage -l libabsl_log_initialize \
%abseil_libpackage -l libabsl_log_internal_check_op \
%abseil_libpackage -l libabsl_log_internal_conditions \
%abseil_libpackage -l libabsl_log_internal_fnmatch \
%abseil_libpackage -l libabsl_log_internal_format \
%abseil_libpackage -l libabsl_log_internal_globals \
%abseil_libpackage -l libabsl_log_internal_log_sink_set \
%abseil_libpackage -l libabsl_log_internal_message \
%abseil_libpackage -l libabsl_log_internal_nullguard \
%abseil_libpackage -l libabsl_log_internal_proto \
%abseil_libpackage -l libabsl_log_internal_structured_proto \
%abseil_libpackage -l libabsl_log_severity \
%abseil_libpackage -l libabsl_log_sink \
%abseil_libpackage -l libabsl_low_level_hash \
%abseil_libpackage -l libabsl_malloc_internal \
%abseil_libpackage -l libabsl_periodic_sampler \
%abseil_libpackage -l libabsl_poison \
%abseil_libpackage -l libabsl_random_distributions \
%abseil_libpackage -l libabsl_random_internal_distribution_test_util \
%abseil_libpackage -l libabsl_random_internal_entropy_pool \
%abseil_libpackage -l libabsl_random_internal_platform \
%abseil_libpackage -l libabsl_random_internal_randen \
%abseil_libpackage -l libabsl_random_internal_randen_hwaes \
%abseil_libpackage -l libabsl_random_internal_randen_hwaes_impl \
%abseil_libpackage -l libabsl_random_internal_randen_slow \
%abseil_libpackage -l libabsl_random_internal_seed_material \
%abseil_libpackage -l libabsl_random_seed_gen_exception \
%abseil_libpackage -l libabsl_random_seed_sequences \
%abseil_libpackage -l libabsl_raw_hash_set \
%abseil_libpackage -l libabsl_raw_logging_internal \
%abseil_libpackage -l libabsl_scoped_set_env \
%abseil_libpackage -l libabsl_spinlock_wait \
%abseil_libpackage -l libabsl_stacktrace \
%abseil_libpackage -l libabsl_status \
%abseil_libpackage -l libabsl_statusor \
%abseil_libpackage -l libabsl_strerror \
%abseil_libpackage -l libabsl_str_format_internal \
%abseil_libpackage -l libabsl_strings \
%abseil_libpackage -l libabsl_strings_internal \
%abseil_libpackage -l libabsl_string_view \
%abseil_libpackage -l libabsl_symbolize \
%abseil_libpackage -l libabsl_synchronization \
%abseil_libpackage -l libabsl_throw_delegate \
%abseil_libpackage -l libabsl_time \
%abseil_libpackage -l libabsl_time_zone \
%abseil_libpackage -l libabsl_tracing_internal \
%abseil_libpackage -l libabsl_utf8_for_code_point \
%abseil_libpackage -l libabsl_vlog_config_internal \
%{nil}
# generator macro for -devel
%define abseil_libpackage(l:d:) Requires: %{-l*}%{-d*}%{lname_suffix} = %{version}
%package devel
Summary: Header files for Abseil
Requires: libabsl_%{lname_suffix}
Requires: libabsl_lite_%{lname_suffix}
%{abseil_libs}
%description devel
Abseil is a collection of C++11 libraries which augment the C++
standard library.
Abseil is a collection of C++ libraries which augment the C++ standard
library.
This package contains headers and build system files for it.
%define abseil_libpackage(l:d:) %package -n %{-l*}%{-d*}%{lname_suffix} \
Summary: Abseil library lib%{-l*} \
%description -n %{-l*}%{-d*}%{lname_suffix} \
This package contains the %{-l*} library for abseil. \
%files -n %{-l*}%{-d*}%{lname_suffix} \
%%license LICENSE \
%{_libdir}/%{-l*}.%{soversion} \
%ldconfig_scriptlets -n %{-l*}%{-d*}%{lname_suffix} \
%{nil}
%{abseil_libs}
%prep
%autosetup -p1
# create baselibs.conf
echo -n "" > %{SOURCE1}
%define abseil_libpackage(l:d:) echo "%{-l*}%{-d*}%{lname_suffix}" >> %{SOURCE1}
%{abseil_libs}
%build
%if 0%{?with_gcc}
export CC="gcc-%{with_gcc}"
export CXX="g++-%{with_gcc}"
%if 0%{?suse_version} < 1600
export CXX=g++-12
%endif
%cmake
%cmake_build
@@ -99,115 +175,6 @@ export CXX="g++-%{with_gcc}"
%check
%ctest
# SLE12 doed not define this macro
%if %{undefined ldconfig_scriptlets}
%post -n libabsl_lite_%{lname_suffix} -p /sbin/ldconfig
%postun -n libabsl_lite_%{lname_suffix} -p /sbin/ldconfig
%post -n libabsl_%{lname_suffix} -p /sbin/ldconfig
%postun -n libabsl_%{lname_suffix} -p /sbin/ldconfig
%else
%ldconfig_scriptlets -n libabsl_lite_%{lname_suffix}
%ldconfig_scriptlets -n libabsl_%{lname_suffix}
%endif
%files -n libabsl_lite_%{lname_suffix}
%license LICENSE
%{_libdir}/libabsl_base.%{soversion}
%{_libdir}/libabsl_city.%{soversion}
%{_libdir}/libabsl_cord.%{soversion}
%{_libdir}/libabsl_cord_internal.%{soversion}
%{_libdir}/libabsl_cordz_functions.%{soversion}
%{_libdir}/libabsl_cordz_handle.%{soversion}
%{_libdir}/libabsl_cordz_info.%{soversion}
%{_libdir}/libabsl_crc32c.%{soversion}
%{_libdir}/libabsl_crc_cord_state.%{soversion}
%{_libdir}/libabsl_crc_internal.%{soversion}
%{_libdir}/libabsl_debugging_internal.%{soversion}
%{_libdir}/libabsl_demangle_internal.%{soversion}
%{_libdir}/libabsl_examine_stack.%{soversion}
%{_libdir}/libabsl_exponential_biased.%{soversion}
%{_libdir}/libabsl_hash.%{soversion}
%{_libdir}/libabsl_int128.%{soversion}
%{_libdir}/libabsl_kernel_timeout_internal.%{soversion}
%{_libdir}/libabsl_log_globals.%{soversion}
%{_libdir}/libabsl_log_internal_check_op.%{soversion}
%{_libdir}/libabsl_log_internal_format.%{soversion}
%{_libdir}/libabsl_log_internal_globals.%{soversion}
%{_libdir}/libabsl_log_internal_log_sink_set.%{soversion}
%{_libdir}/libabsl_log_internal_message.%{soversion}
%{_libdir}/libabsl_log_internal_nullguard.%{soversion}
%{_libdir}/libabsl_log_internal_proto.%{soversion}
%{_libdir}/libabsl_log_sink.%{soversion}
%{_libdir}/libabsl_low_level_hash.%{soversion}
%{_libdir}/libabsl_malloc_internal.%{soversion}
%{_libdir}/libabsl_raw_hash_set.%{soversion}
%{_libdir}/libabsl_raw_logging_internal.%{soversion}
%{_libdir}/libabsl_spinlock_wait.%{soversion}
%{_libdir}/libabsl_stacktrace.%{soversion}
%{_libdir}/libabsl_str_format_internal.%{soversion}
%{_libdir}/libabsl_strerror.%{soversion}
%{_libdir}/libabsl_string_view.%{soversion}
%{_libdir}/libabsl_strings.%{soversion}
%{_libdir}/libabsl_strings_internal.%{soversion}
%{_libdir}/libabsl_symbolize.%{soversion}
%{_libdir}/libabsl_synchronization.%{soversion}
%{_libdir}/libabsl_throw_delegate.%{soversion}
%{_libdir}/libabsl_time.%{soversion}
%{_libdir}/libabsl_time_zone.%{soversion}
%files -n libabsl_%{lname_suffix}
%license LICENSE
%{_libdir}/libabsl_bad_any_cast_impl.%{soversion}
%{_libdir}/libabsl_bad_optional_access.%{soversion}
%{_libdir}/libabsl_bad_variant_access.%{soversion}
%{_libdir}/libabsl_civil_time.%{soversion}
%{_libdir}/libabsl_cordz_sample_token.%{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_failure_signal_handler.%{soversion}
%{_libdir}/libabsl_flags_commandlineflag_internal.%{soversion}
%{_libdir}/libabsl_flags_commandlineflag.%{soversion}
%{_libdir}/libabsl_flags_config.%{soversion}
%{_libdir}/libabsl_flags_internal.%{soversion}
%{_libdir}/libabsl_flags_marshalling.%{soversion}
%{_libdir}/libabsl_flags_parse.%{soversion}
%{_libdir}/libabsl_flags_private_handle_accessor.%{soversion}
%{_libdir}/libabsl_flags_program_name.%{soversion}
%{_libdir}/libabsl_flags_reflection.%{soversion}
%{_libdir}/libabsl_flags_usage_internal.%{soversion}
%{_libdir}/libabsl_flags_usage.%{soversion}
%{_libdir}/libabsl_graphcycles_internal.%{soversion}
%{_libdir}/libabsl_hashtablez_sampler.%{soversion}
%{_libdir}/libabsl_leak_check.%{soversion}
%{_libdir}/libabsl_log_entry.%{soversion}
%{_libdir}/libabsl_log_flags.%{soversion}
%{_libdir}/libabsl_log_initialize.%{soversion}
%{_libdir}/libabsl_log_internal_conditions.%{soversion}
%{_libdir}/libabsl_log_internal_fnmatch.%{soversion}
%{_libdir}/libabsl_log_severity.%{soversion}
%{_libdir}/libabsl_periodic_sampler.%{soversion}
%{_libdir}/libabsl_poison.%{soversion}
%{_libdir}/libabsl_random_distributions.%{soversion}
%{_libdir}/libabsl_random_internal_distribution_test_util.%{soversion}
%{_libdir}/libabsl_random_internal_platform.%{soversion}
%{_libdir}/libabsl_random_internal_pool_urbg.%{soversion}
%{_libdir}/libabsl_random_internal_randen_hwaes_impl.%{soversion}
%{_libdir}/libabsl_random_internal_randen_hwaes.%{soversion}
%{_libdir}/libabsl_random_internal_randen_slow.%{soversion}
%{_libdir}/libabsl_random_internal_randen.%{soversion}
%{_libdir}/libabsl_random_internal_seed_material.%{soversion}
%{_libdir}/libabsl_random_seed_gen_exception.%{soversion}
%{_libdir}/libabsl_random_seed_sequences.%{soversion}
%{_libdir}/libabsl_scoped_set_env.%{soversion}
%{_libdir}/libabsl_statusor.%{soversion}
%{_libdir}/libabsl_status.%{soversion}
%{_libdir}/libabsl_utf8_for_code_point.%{soversion}
%{_libdir}/libabsl_vlog_config_internal.%{soversion}
%files devel
%license LICENSE
%doc README.md

View File

@@ -1,2 +1 @@
libabsl_lite_2407_0_0
libabsl_2407_0_0
# filled by spec file

View File

@@ -1,13 +0,0 @@
Index: abseil-cpp-20240722.0/CMakeLists.txt
===================================================================
--- abseil-cpp-20240722.0.orig/CMakeLists.txt
+++ abseil-cpp-20240722.0/CMakeLists.txt
@@ -16,7 +16,7 @@
# https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md
# As of 2024-07-01, CMake 3.16 is the minimum supported version.
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.5)
# Allow the user to specify the CMAKE_MSVC_DEBUG_INFORMATION_FORMAT
if (POLICY CMP0141)

View File

@@ -3,47 +3,20 @@ to avoid mysterious linker errors when using wrong C++ version in compiler.
This version of patch is for new systems (Tumbleweed) where Abseil is built with C++17 support.
For more information, see “notice for package managers” in options.h
Index: abseil-cpp-20240116.1/absl/base/options.h
Index: abseil-cpp-20250512.0/absl/base/options.h
===================================================================
--- abseil-cpp-20240116.1.orig/absl/base/options.h
+++ abseil-cpp-20240116.1/absl/base/options.h
@@ -94,7 +94,7 @@
// User code should not inspect this macro. To check in the preprocessor if
// absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY.
-#define ABSL_OPTION_USE_STD_ANY 2
+#define ABSL_OPTION_USE_STD_ANY 1
// ABSL_OPTION_USE_STD_OPTIONAL
@@ -121,7 +121,7 @@
// absl::optional is a typedef of std::optional, use the feature macro
// ABSL_USES_STD_OPTIONAL.
-#define ABSL_OPTION_USE_STD_OPTIONAL 2
+#define ABSL_OPTION_USE_STD_OPTIONAL 1
// ABSL_OPTION_USE_STD_STRING_VIEW
@@ -148,7 +148,7 @@
--- abseil-cpp-20250512.0.orig/absl/base/options.h
+++ abseil-cpp-20250512.0/absl/base/options.h
@@ -97,7 +97,7 @@
// absl::string_view is a typedef of std::string_view, use the feature macro
// ABSL_USES_STD_STRING_VIEW.
-#define ABSL_OPTION_USE_STD_STRING_VIEW 2
+#define ABSL_OPTION_USE_STD_STRING_VIEW 1
// ABSL_OPTION_USE_STD_VARIANT
//
@@ -174,7 +174,7 @@
// absl::variant is a typedef of std::variant, use the feature macro
// ABSL_USES_STD_VARIANT.
-#define ABSL_OPTION_USE_STD_VARIANT 2
+#define ABSL_OPTION_USE_STD_VARIANT 1
// ABSL_OPTION_USE_STD_ORDERING
//
@@ -201,7 +201,7 @@
@@ -124,7 +124,7 @@
// the ordering types are aliases of std:: ordering types, use the feature macro
// ABSL_USES_STD_ORDERING.

View File

@@ -1,54 +0,0 @@
Make the headers always tell the truth about the ABI of the compiled dll's
to avoid mysterious linker errors when using wrong C++ version in compiler.
This version of the patch is for old systems where the system compiler does not use C++17.
For more information, see “notice for package managers” in options.h
Index: abseil-cpp-20240116.1/absl/base/options.h
===================================================================
--- abseil-cpp-20240116.1.orig/absl/base/options.h
+++ abseil-cpp-20240116.1/absl/base/options.h
@@ -94,7 +94,7 @@
// User code should not inspect this macro. To check in the preprocessor if
// absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY.
-#define ABSL_OPTION_USE_STD_ANY 2
+#define ABSL_OPTION_USE_STD_ANY 0
// ABSL_OPTION_USE_STD_OPTIONAL
@@ -121,7 +121,7 @@
// absl::optional is a typedef of std::optional, use the feature macro
// ABSL_USES_STD_OPTIONAL.
-#define ABSL_OPTION_USE_STD_OPTIONAL 2
+#define ABSL_OPTION_USE_STD_OPTIONAL 0
// ABSL_OPTION_USE_STD_STRING_VIEW
@@ -148,7 +148,7 @@
// absl::string_view is a typedef of std::string_view, use the feature macro
// ABSL_USES_STD_STRING_VIEW.
-#define ABSL_OPTION_USE_STD_STRING_VIEW 2
+#define ABSL_OPTION_USE_STD_STRING_VIEW 0
// ABSL_OPTION_USE_STD_VARIANT
//
@@ -174,7 +174,7 @@
// absl::variant is a typedef of std::variant, use the feature macro
// ABSL_USES_STD_VARIANT.
-#define ABSL_OPTION_USE_STD_VARIANT 2
+#define ABSL_OPTION_USE_STD_VARIANT 0
// ABSL_OPTION_USE_STD_ORDERING
//
@@ -201,7 +201,7 @@
// the ordering types are aliases of std:: ordering types, use the feature macro
// ABSL_USES_STD_ORDERING.
-#define ABSL_OPTION_USE_STD_ORDERING 2
+#define ABSL_OPTION_USE_STD_ORDERING 0
// ABSL_OPTION_USE_INLINE_NAMESPACE
// ABSL_OPTION_INLINE_NAMESPACE_NAME