From 41e600cd5c963333dbf778f70701feed67c3f0cf Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 25 May 2021 13:25:54 +0200 Subject: [PATCH] grpc: unbreak abseil again --- srcpkgs/grpc/patches/google-sucks.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/srcpkgs/grpc/patches/google-sucks.patch b/srcpkgs/grpc/patches/google-sucks.patch index a60b159c2e9..5284398f4ae 100644 --- a/srcpkgs/grpc/patches/google-sucks.patch +++ b/srcpkgs/grpc/patches/google-sucks.patch @@ -36,6 +36,20 @@ 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 +@@ -63,8 +63,10 @@ void* GetProgramCounter(void* vuc) { + 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.uc_regs->gregs[32]); ++#elif defined(__powerpc__) ++ return reinterpret_cast(context->uc_mcontext.gregs[32]); + #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 @@