diff options
| author | Benjamin Barenblat <bbaren@google.com> | 2023-05-08 14:52:14 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2023-05-08 14:52:14 -0400 |
| commit | fc2fb225f1848cb9908fb99229cd22206835a34c (patch) | |
| tree | f93a3e6006a9f4ff5eb9f43e1259669b916dcf5a /debian/patches/configure.diff | |
| parent | b0e6f2f2877899f1bf361852eaec3eb56aaac74d (diff) | |
| download | abseil-fc2fb225f1848cb9908fb99229cd22206835a34c.tar.gz abseil-fc2fb225f1848cb9908fb99229cd22206835a34c.tar.bz2 abseil-fc2fb225f1848cb9908fb99229cd22206835a34c.zip | |
Update patches
Bump SONAME and inline namespace in configuration, and delete a patch
that has been applied upstream.
Diffstat (limited to 'debian/patches/configure.diff')
| -rw-r--r-- | debian/patches/configure.diff | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/debian/patches/configure.diff b/debian/patches/configure.diff index ff0c64e9..9d1fe736 100644 --- a/debian/patches/configure.diff +++ b/debian/patches/configure.diff @@ -15,19 +15,19 @@ Configure Abseil for Debian. --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake -@@ -281,7 +281,8 @@ +@@ -309,7 +309,8 @@ if(ABSL_ENABLE_INSTALL) set_target_properties(${_NAME} PROPERTIES OUTPUT_NAME "absl_${_NAME}" -- SOVERSION "2206.0.0" -+ SOVERSION 20220623 -+ VERSION "20220623.0.0" +- SOVERSION "2301.0.0" ++ SOVERSION 20230125 ++ VERSION "20230125.0.0" ) endif() else() --- a/absl/base/options.h +++ b/absl/base/options.h -@@ -100,7 +100,7 @@ +@@ -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. @@ -36,7 +36,7 @@ Configure Abseil for Debian. // ABSL_OPTION_USE_STD_OPTIONAL -@@ -127,7 +127,7 @@ +@@ -121,7 +121,7 @@ // absl::optional is a typedef of std::optional, use the feature macro // ABSL_USES_STD_OPTIONAL. @@ -45,7 +45,7 @@ Configure Abseil for Debian. // ABSL_OPTION_USE_STD_STRING_VIEW -@@ -154,7 +154,7 @@ +@@ -148,7 +148,7 @@ // absl::string_view is a typedef of std::string_view, use the feature macro // ABSL_USES_STD_STRING_VIEW. @@ -54,7 +54,7 @@ Configure Abseil for Debian. // ABSL_OPTION_USE_STD_VARIANT // -@@ -180,7 +180,7 @@ +@@ -174,7 +174,7 @@ // absl::variant is a typedef of std::variant, use the feature macro // ABSL_USES_STD_VARIANT. @@ -63,16 +63,16 @@ Configure Abseil for Debian. // ABSL_OPTION_USE_INLINE_NAMESPACE -@@ -206,7 +206,7 @@ +@@ -200,7 +200,7 @@ // allowed. #define ABSL_OPTION_USE_INLINE_NAMESPACE 1 --#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20220623 -+#define ABSL_OPTION_INLINE_NAMESPACE_NAME debian3 +-#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20230125 ++#define ABSL_OPTION_INLINE_NAMESPACE_NAME debian4 // ABSL_OPTION_HARDENED // -@@ -233,6 +233,6 @@ +@@ -227,6 +227,6 @@ // checks enabled by this option may abort the program in a different way and // log additional information when `NDEBUG` is not defined. |