diff options
Diffstat (limited to 'debian/patches/configure.diff')
| -rw-r--r-- | debian/patches/configure.diff | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/debian/patches/configure.diff b/debian/patches/configure.diff index bb88ae7d..dc1ed9e7 100644 --- a/debian/patches/configure.diff +++ b/debian/patches/configure.diff @@ -20,13 +20,13 @@ Configure Abseil for Debian. --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake -@@ -215,6 +215,9 @@ +@@ -217,6 +217,9 @@ OUTPUT_NAME "absl_${_NAME}" ) endif() + -+ set_property(TARGET ${_NAME} PROPERTY SOVERSION 20200225) -+ set_property(TARGET ${_NAME} PROPERTY VERSION "20200225.0.2") ++ set_property(TARGET ${_NAME} PROPERTY SOVERSION 20200923) ++ set_property(TARGET ${_NAME} PROPERTY VERSION "20200923.0.0") else() # Generating header-only library add_library(${_NAME} INTERFACE) @@ -68,37 +68,38 @@ Configure Abseil for Debian. // ABSL_OPTION_USE_INLINE_NAMESPACE -@@ -206,6 +206,6 @@ +@@ -206,7 +206,7 @@ // allowed. #define ABSL_OPTION_USE_INLINE_NAMESPACE 1 --#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_2020_02_25 -+#define ABSL_OPTION_INLINE_NAMESPACE_NAME debian0 +-#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_2020_09_23 ++#define ABSL_OPTION_INLINE_NAMESPACE_NAME debian1 - #endif // ABSL_BASE_OPTIONS_H_ + // ABSL_OPTION_HARDENED + // --- a/absl/container/internal/have_sse.h +++ b/absl/container/internal/have_sse.h @@ -17,22 +17,14 @@ #define ABSL_CONTAINER_INTERNAL_HAVE_SSE_H_ - #ifndef SWISSTABLE_HAVE_SSE2 + #ifndef ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSE2 -#if defined(__SSE2__) || \ - (defined(_MSC_VER) && \ - (defined(_M_X64) || (defined(_M_IX86) && _M_IX86_FP >= 2))) +#if defined(__x86_64__) || (defined(_MSC_VER) && defined(_M_X64)) - #define SWISSTABLE_HAVE_SSE2 1 + #define ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSE2 1 #else - #define SWISSTABLE_HAVE_SSE2 0 + #define ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSE2 0 #endif #endif --#ifndef SWISSTABLE_HAVE_SSSE3 +-#ifndef ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSSE3 -#ifdef __SSSE3__ --#define SWISSTABLE_HAVE_SSSE3 1 +-#define ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSSE3 1 -#else - #define SWISSTABLE_HAVE_SSSE3 0 + #define ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSSE3 0 -#endif -#endif - #if SWISSTABLE_HAVE_SSSE3 && !SWISSTABLE_HAVE_SSE2 - #error "Bad configuration!" + #if ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSSE3 && \ + !ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSE2 |