From b18210025bb6f47d2aaed0a48ff22afd0156741d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 6 Oct 2022 10:32:09 -0400 Subject: [PATCH] python3-grpcio: update to 1.49.1. --- .../python3-grpcio/patches/abseil-sucks.patch | 49 ------------------- srcpkgs/python3-grpcio/template | 20 +++----- 2 files changed, 8 insertions(+), 61 deletions(-) delete mode 100644 srcpkgs/python3-grpcio/patches/abseil-sucks.patch diff --git a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch b/srcpkgs/python3-grpcio/patches/abseil-sucks.patch deleted file mode 100644 index 4b328a58fd9..00000000000 --- a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch +++ /dev/null @@ -1,49 +0,0 @@ -An all-in-one patch that fixes several issues: - -1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl) -2) powerpc stacktrace implementation only works on glibc (disabled on musl) -3) powerpc stacktrace implementation has ppc64 assumptions (fixed) -4) examine_stack.cpp makes glibc assumptions on powerpc (fixed) - ---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc -+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc -@@ -20,7 +20,7 @@ - #include - #endif - --#if defined(__powerpc__) || defined(__ppc__) -+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) - #ifdef __GLIBC__ - #include - #elif defined(__FreeBSD__) -@@ -59,7 +59,7 @@ - return base_internal::NominalCPUFrequency(); - } - --#elif defined(__powerpc__) || defined(__ppc__) -+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) - - int64_t UnscaledCycleClock::Now() { - #ifdef __GLIBC__ ---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h -+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h -@@ -46,7 +46,7 @@ - - // The following platforms have an implementation of a hardware counter. - #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ -- defined(__powerpc__) || defined(__ppc__) || \ -+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ - defined(_M_IX86) || defined(_M_X64) - #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 - #else ---- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h -+++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h -@@ -64,7 +64,7 @@ - #elif defined(__i386__) || defined(__x86_64__) - #define ABSL_STACKTRACE_INL_HEADER \ - "absl/debugging/internal/stacktrace_x86-inl.inc" --#elif defined(__ppc__) || defined(__PPC__) -+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__) - #define ABSL_STACKTRACE_INL_HEADER \ - "absl/debugging/internal/stacktrace_powerpc-inl.inc" - #elif defined(__aarch64__) diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template index aab1ae69886..10779ba330c 100644 --- a/srcpkgs/python3-grpcio/template +++ b/srcpkgs/python3-grpcio/template @@ -1,18 +1,19 @@ # Template file for 'python3-grpcio' pkgname=python3-grpcio -version=1.39.0 -revision=2 +version=1.49.1 +revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python3-module hostmakedepends="python3-setuptools python3-six python3-Cython" -makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel" +makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel + abseil-cpp-devel" depends="python3-six" short_desc="HTTP/2-based gRPC framework for Python" maintainer="Orphaned " license="Apache-2.0" homepage="https://grpc.io" distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz" -checksum=57974361a459d6fe04c9ae0af1845974606612249f467bbd2062d963cb90f407 +checksum=d4725fc9ec8e8822906ae26bb26f5546891aa7fbc3443de970cc556d43a5c99f if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" @@ -22,17 +23,12 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" libexecinfo-devel" fi +export GRPC_PYTHON_BUILD_SYSTEM_ABSL=1 export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1 export GRPC_PYTHON_BUILD_SYSTEM_CARES=1 export GRPC_PYTHON_BUILD_SYSTEM_RE2=1 export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1 -post_patch() { - if [ "${CROSS_BUILD}" ]; then - vsed -i setup.py -e "s@['\"]cc['\"]@'${CC}'@g" \ - -e "/os.path.join/s@/usr@${XBPS_CROSS_BASE}/usr@g" - vsed -e "s@['\"]cc['\"]@'${CC}'@g" \ - -i src/python/grpcio/commands.py - fi - rm -f src/python/grpcio/grpc/_cython/cygrpc.cpp +post_extract() { + rm src/python/grpcio/grpc/_cython/cygrpc.cpp }