From 1268f609aafd78796a66f13fa7eac88efe0cb097 Mon Sep 17 00:00:00 2001 From: Benjamin Barenblat Date: Thu, 8 Apr 2021 10:44:48 -0400 Subject: Begin updating packaging for Abseil 20210324 Bump package versions and names to reflect the new Abseil LTS. Remove patches that have been incorporated upstream, and refresh other patches. --- debian/patches/configure.diff | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'debian/patches/configure.diff') diff --git a/debian/patches/configure.diff b/debian/patches/configure.diff index 5c47b152..786994b0 100644 --- a/debian/patches/configure.diff +++ b/debian/patches/configure.diff @@ -22,16 +22,16 @@ Configure Abseil for Debian. --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake -@@ -217,6 +217,9 @@ +@@ -263,7 +263,8 @@ + if(ABSL_ENABLE_INSTALL) + set_target_properties(${_NAME} PROPERTIES OUTPUT_NAME "absl_${_NAME}" +- SOVERSION "2103.0.0" ++ SOVERSION 20210324 ++ VERSION "20210324.0.0" ) endif() -+ -+ set_property(TARGET ${_NAME} PROPERTY SOVERSION 20200923) -+ set_property(TARGET ${_NAME} PROPERTY VERSION "20200923.0.1") else() - # Generating header-only library - add_library(${_NAME} INTERFACE) --- a/absl/base/options.h +++ b/absl/base/options.h @@ -100,7 +100,7 @@ @@ -74,8 +74,8 @@ Configure Abseil for Debian. // allowed. #define ABSL_OPTION_USE_INLINE_NAMESPACE 1 --#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_2020_09_23 -+#define ABSL_OPTION_INLINE_NAMESPACE_NAME debian1 +-#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20210324 ++#define ABSL_OPTION_INLINE_NAMESPACE_NAME debian2 // ABSL_OPTION_HARDENED // -- cgit v1.2.3