diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-12-15 08:52:35 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-12-18 22:17:21 -0800 |
| commit | d595b18e4691967fb5b699e9272f916d769a28d7 (patch) | |
| tree | b3f3d2fafb6f8cfb6e8166129dc4161c7c6e95a5 /meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch | |
| parent | a293a7128af89a7cace861333b13387bccbf5de2 (diff) | |
| download | meta-openembedded-d595b18e4691967fb5b699e9272f916d769a28d7.tar.gz | |
python3-grpcio: update 1.56.2 -> 1.59.3
This is needed for python 3.12 compatibility.
Drop 0001-direct_mmap-Use-off_t-on-linux.patch as
issue resolved upstream.
Other dropped patches are all due to the code being significantly refactored upstream;
if the issues persist, please write updated patches.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch')
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch | 63 |
1 files changed, 37 insertions, 26 deletions
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch index 4100cf63f7..4bb60b6e2c 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch | |||
| @@ -1,4 +1,7 @@ | |||
| 1 | An all-in-one patch that fixes several issues: | 1 | From 9cec6297effa9fab6f0c71e342046daceecd7d4d Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 13 Mar 2021 10:26:25 -0800 | ||
| 4 | Subject: [PATCH] An all-in-one patch that fixes several issues: | ||
| 2 | 5 | ||
| 3 | 1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl) | 6 | 1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl) |
| 4 | 2) powerpc stacktrace implementation only works on glibc (disabled on musl) | 7 | 2) powerpc stacktrace implementation only works on glibc (disabled on musl) |
| @@ -7,19 +10,21 @@ An all-in-one patch that fixes several issues: | |||
| 7 | 10 | ||
| 8 | Sourced from void linux | 11 | Sourced from void linux |
| 9 | 12 | ||
| 13 | Upstream-Status: Pending | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com> | 15 | Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com> |
| 12 | --- | ||
| 13 | Upstream-Status: Pending | ||
| 14 | 16 | ||
| 15 | absl/base/internal/unscaledcycleclock.cc | 4 ++-- | 17 | --- |
| 16 | absl/base/internal/unscaledcycleclock.h | 3 ++- | 18 | .../abseil-cpp/absl/base/internal/unscaledcycleclock.cc | 4 ++-- |
| 17 | absl/debugging/internal/examine_stack.cc | 8 +++++++- | 19 | .../absl/base/internal/unscaledcycleclock_config.h | 3 ++- |
| 18 | absl/debugging/internal/stacktrace_config.h | 2 +- | 20 | .../abseil-cpp/absl/debugging/internal/examine_stack.cc | 8 +++++++- |
| 21 | .../absl/debugging/internal/stacktrace_config.h | 2 +- | ||
| 19 | 4 files changed, 12 insertions(+), 5 deletions(-) | 22 | 4 files changed, 12 insertions(+), 5 deletions(-) |
| 20 | 23 | ||
| 21 | --- a/absl/base/internal/unscaledcycleclock.cc | 24 | diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc |
| 22 | +++ b/absl/base/internal/unscaledcycleclock.cc | 25 | index b1c396c..d62bfd6 100644 |
| 26 | --- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc | ||
| 27 | +++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc | ||
| 23 | @@ -20,7 +20,7 @@ | 28 | @@ -20,7 +20,7 @@ |
| 24 | #include <intrin.h> | 29 | #include <intrin.h> |
| 25 | #endif | 30 | #endif |
| @@ -38,8 +43,24 @@ Upstream-Status: Pending | |||
| 38 | 43 | ||
| 39 | int64_t UnscaledCycleClock::Now() { | 44 | int64_t UnscaledCycleClock::Now() { |
| 40 | #ifdef __GLIBC__ | 45 | #ifdef __GLIBC__ |
| 41 | --- a/absl/debugging/internal/examine_stack.cc | 46 | diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h |
| 42 | +++ b/absl/debugging/internal/examine_stack.cc | 47 | index 24b324a..5e232c1 100644 |
| 48 | --- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h | ||
| 49 | +++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h | ||
| 50 | @@ -21,7 +21,8 @@ | ||
| 51 | |||
| 52 | // The following platforms have an implementation of a hardware counter. | ||
| 53 | #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ | ||
| 54 | - defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ | ||
| 55 | + ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ | ||
| 56 | + defined(__riscv) || \ | ||
| 57 | defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) | ||
| 58 | #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 | ||
| 59 | #else | ||
| 60 | diff --git a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc | ||
| 61 | index 5786322..72c7c46 100644 | ||
| 62 | --- a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc | ||
| 63 | +++ b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc | ||
| 43 | @@ -33,6 +33,10 @@ | 64 | @@ -33,6 +33,10 @@ |
| 44 | #include <csignal> | 65 | #include <csignal> |
| 45 | #include <cstdio> | 66 | #include <cstdio> |
| @@ -51,7 +72,7 @@ Upstream-Status: Pending | |||
| 51 | #include "absl/base/attributes.h" | 72 | #include "absl/base/attributes.h" |
| 52 | #include "absl/base/internal/raw_logging.h" | 73 | #include "absl/base/internal/raw_logging.h" |
| 53 | #include "absl/base/macros.h" | 74 | #include "absl/base/macros.h" |
| 54 | @@ -174,8 +178,10 @@ void* GetProgramCounter(void* const vuc) | 75 | @@ -174,8 +178,10 @@ void* GetProgramCounter(void* const vuc) { |
| 55 | return reinterpret_cast<void*>(context->uc_mcontext.pc); | 76 | return reinterpret_cast<void*>(context->uc_mcontext.pc); |
| 56 | #elif defined(__powerpc64__) | 77 | #elif defined(__powerpc64__) |
| 57 | return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]); | 78 | return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]); |
| @@ -63,8 +84,10 @@ Upstream-Status: Pending | |||
| 63 | #elif defined(__riscv) | 84 | #elif defined(__riscv) |
| 64 | return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]); | 85 | return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]); |
| 65 | #elif defined(__s390__) && !defined(__s390x__) | 86 | #elif defined(__s390__) && !defined(__s390x__) |
| 66 | --- a/absl/debugging/internal/stacktrace_config.h | 87 | diff --git a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h |
| 67 | +++ b/absl/debugging/internal/stacktrace_config.h | 88 | index 3929b1b..23d5e50 100644 |
| 89 | --- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h | ||
| 90 | +++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h | ||
| 68 | @@ -60,7 +60,7 @@ | 91 | @@ -60,7 +60,7 @@ |
| 69 | #elif defined(__i386__) || defined(__x86_64__) | 92 | #elif defined(__i386__) || defined(__x86_64__) |
| 70 | #define ABSL_STACKTRACE_INL_HEADER \ | 93 | #define ABSL_STACKTRACE_INL_HEADER \ |
| @@ -74,15 +97,3 @@ Upstream-Status: Pending | |||
| 74 | #define ABSL_STACKTRACE_INL_HEADER \ | 97 | #define ABSL_STACKTRACE_INL_HEADER \ |
| 75 | "absl/debugging/internal/stacktrace_powerpc-inl.inc" | 98 | "absl/debugging/internal/stacktrace_powerpc-inl.inc" |
| 76 | #elif defined(__aarch64__) | 99 | #elif defined(__aarch64__) |
| 77 | --- a/absl/base/internal/unscaledcycleclock_config.h | ||
| 78 | +++ b/absl/base/internal/unscaledcycleclock_config.h | ||
| 79 | @@ -21,7 +21,8 @@ | ||
| 80 | |||
| 81 | // The following platforms have an implementation of a hardware counter. | ||
| 82 | #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ | ||
| 83 | - defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ | ||
| 84 | + ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ | ||
| 85 | + defined(__riscv) || \ | ||
| 86 | defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) | ||
| 87 | #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 | ||
| 88 | #else | ||
