From fc2fb225f1848cb9908fb99229cd22206835a34c Mon Sep 17 00:00:00 2001
From: Benjamin Barenblat <bbaren@google.com>
Date: Mon, 8 May 2023 14:52:14 -0400
Subject: Update patches
Bump SONAME and inline namespace in configuration, and delete a patch
that has been applied upstream.
---
debian/patches/configure.diff | 24 ++++++++++++------------
debian/patches/cordz-info-statistics-test.diff | 2 +-
debian/patches/cpu-features.diff | 11 ++++++-----
debian/patches/latomic.diff | 2 +-
debian/patches/leaky-pkgconfig-cflags.diff | 16 ----------------
debian/patches/series | 1 -
6 files changed, 20 insertions(+), 36 deletions(-)
delete mode 100644 debian/patches/leaky-pkgconfig-cflags.diff
(limited to 'debian')
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.
diff --git a/debian/patches/cordz-info-statistics-test.diff b/debian/patches/cordz-info-statistics-test.diff
index 6e0bfcce..646133a1 100644
--- a/debian/patches/cordz-info-statistics-test.diff
+++ b/debian/patches/cordz-info-statistics-test.diff
@@ -1,6 +1,6 @@
--- a/absl/strings/internal/cordz_info_statistics_test.cc
+++ b/absl/strings/internal/cordz_info_statistics_test.cc
-@@ -466,6 +466,8 @@
+@@ -468,6 +468,8 @@
}
TEST(CordzInfoStatisticsTest, ThreadSafety) {
diff --git a/debian/patches/cpu-features.diff b/debian/patches/cpu-features.diff
index 7610e6b1..2f462e39 100644
--- a/debian/patches/cpu-features.diff
+++ b/debian/patches/cpu-features.diff
@@ -17,7 +17,7 @@ Explicitly set supported CPU features.
--- a/absl/base/config.h
+++ b/absl/base/config.h
-@@ -862,7 +862,7 @@
+@@ -887,7 +887,7 @@
// which architectures support the various x86 instruction sets.
#ifdef ABSL_INTERNAL_HAVE_SSE
#error ABSL_INTERNAL_HAVE_SSE cannot be directly set
@@ -26,7 +26,7 @@ Explicitly set supported CPU features.
#define ABSL_INTERNAL_HAVE_SSE 1
#elif defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 1)
// MSVC only defines _M_IX86_FP for x86 32-bit code, and _M_IX86_FP >= 1
-@@ -877,7 +877,7 @@
+@@ -902,7 +902,7 @@
// which architectures support the various x86 instruction sets.
#ifdef ABSL_INTERNAL_HAVE_SSE2
#error ABSL_INTERNAL_HAVE_SSE2 cannot be directly set
@@ -35,7 +35,7 @@ Explicitly set supported CPU features.
#define ABSL_INTERNAL_HAVE_SSE2 1
#elif defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
// MSVC only defines _M_IX86_FP for x86 32-bit code, and _M_IX86_FP >= 2
-@@ -898,15 +898,13 @@
+@@ -923,8 +923,6 @@
// by the CPU.
#ifdef ABSL_INTERNAL_HAVE_SSSE3
#error ABSL_INTERNAL_HAVE_SSSE3 cannot be directly set
@@ -44,10 +44,11 @@ Explicitly set supported CPU features.
#endif
// ABSL_INTERNAL_HAVE_ARM_NEON is used for compile-time detection of NEON (ARM
- // SIMD).
+@@ -936,7 +934,7 @@
+ // https://llvm.org/docs/CompileCudaWithLLVM.html#detecting-clang-vs-nvcc-from-code
#ifdef ABSL_INTERNAL_HAVE_ARM_NEON
#error ABSL_INTERNAL_HAVE_ARM_NEON cannot be directly set
--#elif defined(__ARM_NEON)
+-#elif defined(__ARM_NEON) && !defined(__CUDA_ARCH__)
+#elif defined(__aarch64__)
#define ABSL_INTERNAL_HAVE_ARM_NEON 1
#endif
diff --git a/debian/patches/latomic.diff b/debian/patches/latomic.diff
index 71cf7959..92b4f30c 100644
--- a/debian/patches/latomic.diff
+++ b/debian/patches/latomic.diff
@@ -9,7 +9,7 @@ if anything needs libatomic and add the DT_NEEDED entry where necessary.
--- a/absl/copts/AbseilConfigureCopts.cmake
+++ b/absl/copts/AbseilConfigureCopts.cmake
-@@ -94,4 +94,8 @@
+@@ -93,4 +93,8 @@
set(ABSL_TEST_COPTS "")
endif()
diff --git a/debian/patches/leaky-pkgconfig-cflags.diff b/debian/patches/leaky-pkgconfig-cflags.diff
deleted file mode 100644
index cf1479d4..00000000
--- a/debian/patches/leaky-pkgconfig-cflags.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Bruno Pitrus <brunopitrus@hotmail.com>
-Subject: Do not leak -maes -msse4.1 into pkgconfig
-Forwarded: https://github.com/abseil/abseil-cpp/pull/1216
-Origin: upstream, https://github.com/abseil/abseil-cpp/commit/09e96049995584c3489e4bd1467313e3e85af99c
-
---- a/CMake/AbseilHelpers.cmake
-+++ b/CMake/AbseilHelpers.cmake
-@@ -166,6 +166,8 @@
- set(PC_CFLAGS "${PC_CFLAGS} ${cflag}")
- elseif(${cflag} MATCHES "^(-W|/w[1234eo])")
- # Don't impose our warnings on others.
-+ elseif(${cflag} MATCHES "^-m")
-+ # Don't impose CPU instruction requirements on others, as the code performs feature detection on runtime.
- else()
- set(PC_CFLAGS "${PC_CFLAGS} ${cflag}")
- endif()
diff --git a/debian/patches/series b/debian/patches/series
index 277aba50..4bc01f60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@ configure.diff
cpu-features.diff
latomic.diff
empty-flags-library.diff
-leaky-pkgconfig-cflags.diff
cordz-info-statistics-test.diff
--
cgit v1.2.3