diff options
author | Peter Marko <peter.marko@siemens.com> | 2025-02-23 12:03:35 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2025-02-23 09:56:37 -0800 |
commit | c6e9064debe85b1e4b721e251ec7f09b435cb4a8 (patch) | |
tree | 7f054598583579ae0036afd226fdf22771c4d05f /meta-python/recipes-devtools/python/python3-grpcio | |
parent | d4036efd3f8ab6921fb378543654d18a206d0757 (diff) | |
download | meta-openembedded-c6e9064debe85b1e4b721e251ec7f09b435cb4a8.tar.gz |
python3-grpcio: revert unbundling abseil-cpp
This reverts commit 990b03b6165808cebe59886e4941bb86b05744e2.
>>> import grpc
Traceback (most recent call last):
File "<python-input-0>", line 1, in <module>
import grpc
File "/usr/lib/python3.13/site-packages/grpc/__init__.py", line 22, in <module>
from grpc import _compression
File "/usr/lib/python3.13/site-packages/grpc/_compression.py", line 20, in <module>
from grpc._cython import cygrpc
ImportError: /usr/lib/python3.13/site-packages/grpc/_cython/cygrpc.cpython-313-x86_64-linux-gnu.so: undefined symbol: _ZN4absl12lts_2024072212log_internal17kUnsignedCharNullE
Even installing whole abseil-ccp does not solve this.
ldd on this library does not include libraries containing this symbol.
Some work in linking upstram would be needed.
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python/python3-grpcio')
-rw-r--r-- | meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch | 102 |
1 files changed, 102 insertions, 0 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 new file mode 100644 index 0000000000..69e06a7918 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch | |||
@@ -0,0 +1,102 @@ | |||
1 | From a2ec96a96ff7ba016e800212a942b9f29f255415 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: | ||
5 | |||
6 | 1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl) | ||
7 | 2) powerpc stacktrace implementation only works on glibc (disabled on musl) | ||
8 | 3) powerpc stacktrace implementation has ppc64 assumptions (fixed) | ||
9 | 4) examine_stack.cpp makes glibc assumptions on powerpc (fixed) | ||
10 | |||
11 | Sourced from void linux | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com> | ||
16 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
17 | --- | ||
18 | .../abseil-cpp/absl/base/internal/unscaledcycleclock.cc | 4 ++-- | ||
19 | .../absl/base/internal/unscaledcycleclock_config.h | 3 ++- | ||
20 | .../abseil-cpp/absl/debugging/internal/examine_stack.cc | 8 +++++++- | ||
21 | .../absl/debugging/internal/stacktrace_config.h | 2 +- | ||
22 | 4 files changed, 12 insertions(+), 5 deletions(-) | ||
23 | |||
24 | diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc | ||
25 | index a0bf3a6..103b4f6 100644 | ||
26 | --- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc | ||
27 | +++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc | ||
28 | @@ -20,7 +20,7 @@ | ||
29 | #include <intrin.h> | ||
30 | #endif | ||
31 | |||
32 | -#if defined(__powerpc__) || defined(__ppc__) | ||
33 | +#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) | ||
34 | #ifdef __GLIBC__ | ||
35 | #include <sys/platform/ppc.h> | ||
36 | #elif defined(__FreeBSD__) | ||
37 | @@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() { | ||
38 | return base_internal::NominalCPUFrequency(); | ||
39 | } | ||
40 | |||
41 | -#elif defined(__powerpc__) || defined(__ppc__) | ||
42 | +#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) | ||
43 | |||
44 | int64_t UnscaledCycleClock::Now() { | ||
45 | #ifdef __GLIBC__ | ||
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 | ||
47 | index 43a3dab..196a853 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(_M_IX86) || \ | ||
55 | + ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ | ||
56 | + defined(_M_IX86) || \ | ||
57 | (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 3dd6ba1..9f0601c 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 | ||
64 | @@ -36,6 +36,10 @@ | ||
65 | #include <csignal> | ||
66 | #include <cstdio> | ||
67 | |||
68 | +#if defined(__powerpc__) | ||
69 | +#include <asm/ptrace.h> | ||
70 | +#endif | ||
71 | + | ||
72 | #include "absl/base/attributes.h" | ||
73 | #include "absl/base/internal/raw_logging.h" | ||
74 | #include "absl/base/macros.h" | ||
75 | @@ -177,8 +181,10 @@ void* GetProgramCounter(void* const vuc) { | ||
76 | return reinterpret_cast<void*>(context->uc_mcontext.pc); | ||
77 | #elif defined(__powerpc64__) | ||
78 | return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]); | ||
79 | -#elif defined(__powerpc__) | ||
80 | +#elif defined(__powerpc__) && defined(__GLIBC__) | ||
81 | return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]); | ||
82 | +#elif defined(__powerpc__) | ||
83 | + return reinterpret_cast<void*>(((struct pt_regs *)context->uc_regs)->gregs[32]); | ||
84 | #elif defined(__riscv) | ||
85 | return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]); | ||
86 | #elif defined(__s390__) && !defined(__s390x__) | ||
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 | ||
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 | ||
91 | @@ -60,7 +60,7 @@ | ||
92 | #elif defined(__i386__) || defined(__x86_64__) | ||
93 | #define ABSL_STACKTRACE_INL_HEADER \ | ||
94 | "absl/debugging/internal/stacktrace_x86-inl.inc" | ||
95 | -#elif defined(__ppc__) || defined(__PPC__) | ||
96 | +#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__) | ||
97 | #define ABSL_STACKTRACE_INL_HEADER \ | ||
98 | "absl/debugging/internal/stacktrace_powerpc-inl.inc" | ||
99 | #elif defined(__aarch64__) | ||
100 | -- | ||
101 | 2.43.0 | ||
102 | |||