diff --git a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch b/srcpkgs/python3-grpcio/patches/abseil-sucks.patch index cb8ca07bdca..a60b159c2e9 100644 --- a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch +++ b/srcpkgs/python3-grpcio/patches/abseil-sucks.patch @@ -36,31 +36,6 @@ An all-in-one patch that fixes several issues: defined(_M_IX86) || defined(_M_X64) #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 #else ---- third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc -+++ third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc -@@ -27,6 +27,10 @@ - #include - #include - -+#if defined(__powerpc__) -+#include -+#endif -+ - #include "absl/base/attributes.h" - #include "absl/base/internal/raw_logging.h" - #include "absl/base/macros.h" -@@ -55,8 +59,10 @@ - return reinterpret_cast(context->uc_mcontext.pc); - #elif defined(__powerpc64__) - return reinterpret_cast(context->uc_mcontext.gp_regs[32]); --#elif defined(__powerpc__) -+#elif defined(__powerpc__) && defined(__GLIBC__) - return reinterpret_cast(context->uc_mcontext.regs->nip); -+#elif defined(__powerpc__) -+ return reinterpret_cast(((struct pt_regs *)context->uc_regs)->nip); - #elif defined(__riscv) - return reinterpret_cast(context->uc_mcontext.__gregs[REG_PC]); - #elif defined(__s390__) && !defined(__s390x__) --- third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h +++ third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h @@ -64,7 +64,7 @@ @@ -72,19 +47,3 @@ An all-in-one patch that fixes several issues: #define ABSL_STACKTRACE_INL_HEADER \ "absl/debugging/internal/stacktrace_powerpc-inl.inc" #elif defined(__aarch64__) ---- third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc -+++ third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc -@@ -130,8 +130,13 @@ - StacktracePowerPCGetLR(new_sp) == kernel_sigtramp_rt64_address) { - const ucontext_t* signal_context = - reinterpret_cast(uc); -+#if defined(__powerpc64__) - void **const sp_before_signal = - reinterpret_cast(signal_context->uc_mcontext.gp_regs[PT_R1]); -+#else -+ void **const sp_before_signal = -+ reinterpret_cast(signal_context->uc_mcontext.uc_regs->gregs[PT_R1]); -+#endif - // Check that alleged sp before signal is nonnull and is reasonably - // aligned. - if (sp_before_signal != nullptr && diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template index d07c5a62438..cc8966c045f 100644 --- a/srcpkgs/python3-grpcio/template +++ b/srcpkgs/python3-grpcio/template @@ -1,6 +1,6 @@ # Template file for 'python3-grpcio' pkgname=python3-grpcio -version=1.37.1 +version=1.38.0 revision=1 archs="x86_64* i686* aarch64* armv[67]* ppc64le*" wrksrc="${pkgname#*-}-${version}" @@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford " license="Apache-2.0" homepage="https://grpc.io" distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz" -checksum=df8305806311d3fe913d4f7eb3ef28e2072159ea12f95baab5d447f1380a71e3 +checksum=abbf9c8c3df4d5233d5888c6cfa85c1bb68a6923749bd4dd1abc6e1e93986f17 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel"