diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/bug970333.diff | 20 | ||||
| -rw-r--r-- | debian/patches/configure.diff | 104 | ||||
| -rw-r--r-- | debian/patches/license.diff | 59 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
4 files changed, 186 insertions, 0 deletions
diff --git a/debian/patches/bug970333.diff b/debian/patches/bug970333.diff new file mode 100644 index 00000000..efca5a5a --- /dev/null +++ b/debian/patches/bug970333.diff @@ -0,0 +1,20 @@ +From: Zach Toogood <zach@yousician.com> +Subject: Fix CMake Threads dependency issue +Origin: upstream, https://github.com/abseil/abseil-cpp/commit/68494aae959dfbbf781cdf03a988d2f5fc7e4802 +Bug: https://github.com/abseil/abseil-cpp/issues/668 +Bug-Debian: https://bugs.debian.org/970333 + +Improve CMake support by finding the Threads module with find_dependency +rather than trying to include it directly. This silences a CMake warning. + +--- a/CMake/abslConfig.cmake.in ++++ b/CMake/abslConfig.cmake.in +@@ -1,6 +1,7 @@ + # absl CMake configuration file. + +-include(FindThreads) ++include(CMakeFindDependencyMacro) ++find_dependency(Threads) + + @PACKAGE_INIT@ + diff --git a/debian/patches/configure.diff b/debian/patches/configure.diff new file mode 100644 index 00000000..bb88ae7d --- /dev/null +++ b/debian/patches/configure.diff @@ -0,0 +1,104 @@ +From: Benjamin Barenblat <bbaren@google.com> +Subject: Set package configuration options +Forwarded: not-needed + +Configure Abseil for Debian. + + - Set the SONAME appropriately. + + - To minimize the possibility of future ABI breakage, treat absl::any, + absl::optional, absl::string_view, and absl::variant as their own types + (rather than aliases for the std:: versions), and compile everything in an + inline namespace. + + - Disable Intel SSE2 on i386, since Debian supports some i386 processors + without that extension. Keep it enabled on amd64, since all amd64 processors + have it. + + - Disable Intel SSSE3 entirely, since no i386 processor supports it and Debian + supports amd64 processors without it. + +--- a/CMake/AbseilHelpers.cmake ++++ b/CMake/AbseilHelpers.cmake +@@ -215,6 +215,9 @@ + OUTPUT_NAME "absl_${_NAME}" + ) + endif() ++ ++ set_property(TARGET ${_NAME} PROPERTY SOVERSION 20200225) ++ set_property(TARGET ${_NAME} PROPERTY VERSION "20200225.0.2") + else() + # Generating header-only library + add_library(${_NAME} INTERFACE) +--- a/absl/base/options.h ++++ b/absl/base/options.h +@@ -100,7 +100,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 +@@ -127,7 +127,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 +@@ -154,7 +154,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 + // +@@ -180,7 +180,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_INLINE_NAMESPACE +@@ -206,6 +206,6 @@ + // 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 + + #endif // ABSL_BASE_OPTIONS_H_ +--- 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 +-#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 + #else + #define SWISSTABLE_HAVE_SSE2 0 + #endif + #endif + +-#ifndef SWISSTABLE_HAVE_SSSE3 +-#ifdef __SSSE3__ +-#define SWISSTABLE_HAVE_SSSE3 1 +-#else + #define SWISSTABLE_HAVE_SSSE3 0 +-#endif +-#endif + + #if SWISSTABLE_HAVE_SSSE3 && !SWISSTABLE_HAVE_SSE2 + #error "Bad configuration!" diff --git a/debian/patches/license.diff b/debian/patches/license.diff new file mode 100644 index 00000000..08f315e4 --- /dev/null +++ b/debian/patches/license.diff @@ -0,0 +1,59 @@ +From: Benjamin Barenblat <bbaren@google.com> +Subject: Correct Apache license headers +Forwarded: yes +Applied-Upstream: https://github.com/abseil/abseil-cpp/commit/bd317cae3bc2630d1b12c5f1d77036e937d1d725 + +This repository has always been licensed under the Apache license, but some +files lacked headers to locally indicate that fact. Add the appropriate headers. + +The author works at Google. Upstream applied this patch as Piper revision +310223650 and exported it to GitHub; the Applied-Upstream URL above points to +the exported commit. + +--- a/absl/debugging/internal/stacktrace_arm-inl.inc ++++ b/absl/debugging/internal/stacktrace_arm-inl.inc +@@ -1,9 +1,18 @@ +-// Copyright 2011 and onwards Google Inc. +-// All rights reserved. ++// Copyright 2017 The Abseil Authors. ++// ++// Licensed under the Apache License, Version 2.0 (the "License"); ++// you may not use this file except in compliance with the License. ++// You may obtain a copy of the License at ++// ++// https://www.apache.org/licenses/LICENSE-2.0 ++// ++// Unless required by applicable law or agreed to in writing, software ++// distributed under the License is distributed on an "AS IS" BASIS, ++// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++// See the License for the specific language governing permissions and ++// limitations under the License. + // +-// Author: Doug Kwan + // This is inspired by Craig Silverstein's PowerPC stacktrace code. +-// + + #ifndef ABSL_DEBUGGING_INTERNAL_STACKTRACE_ARM_INL_H_ + #define ABSL_DEBUGGING_INTERNAL_STACKTRACE_ARM_INL_H_ +--- a/absl/debugging/internal/stacktrace_generic-inl.inc ++++ b/absl/debugging/internal/stacktrace_generic-inl.inc +@@ -1,7 +1,16 @@ +-// Copyright 2000 - 2007 Google Inc. +-// All rights reserved. ++// Copyright 2017 The Abseil Authors. + // +-// Author: Sanjay Ghemawat ++// Licensed under the Apache License, Version 2.0 (the "License"); ++// you may not use this file except in compliance with the License. ++// You may obtain a copy of the License at ++// ++// https://www.apache.org/licenses/LICENSE-2.0 ++// ++// Unless required by applicable law or agreed to in writing, software ++// distributed under the License is distributed on an "AS IS" BASIS, ++// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++// See the License for the specific language governing permissions and ++// limitations under the License. + // + // Portable implementation - just use glibc + // diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..f544d1d9 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +license.diff +configure.diff +bug970333.diff |