diff --git a/common/shlibs b/common/shlibs index a5b2959a3d..3ba07ad0ca 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3706,18 +3706,18 @@ liboblibs.so.0.0 oblibs-0.0.1.1_1 libaal-1.0.so.7 libaal-1.0.7_1 libaal-minimal.so.0 libaal-1.0.7_1 libcli.so.1.9 libcli-1.9.8.4_1 -libaddress_sorting.so.13 grpc-1.33.1_1 -libgpr.so.13 grpc-1.33.1_1 +libaddress_sorting.so.14 grpc-1.34.0_1 +libgpr.so.14 grpc-1.34.0_1 libgrpc++.so.1 grpc-1.19.1_1 libgrpc++_alts.so.1 grpc-1.32.0_1 libgrpc++_error_details.so.1 grpc-1.19.1_1 libgrpc++_reflection.so.1 grpc-1.19.1_1 libgrpc++_unsecure.so.1 grpc-1.19.1_1 -libgrpc.so.13 grpc-1.33.1_1 +libgrpc.so.14 grpc-1.34.0_1 libgrpc_plugin_support.so.1 grpc-1.32.0_1 -libgrpc_unsecure.so.13 grpc-1.33.1_1 +libgrpc_unsecure.so.14 grpc-1.34.0_1 libgrpcpp_channelz.so.1 grpc-1.19.1_1 -libupb.so.13 grpc-1.33.1_1 +libupb.so.14 grpc-1.34.0_1 libircclient.so.1 libircclient-1.10_1 libFAudio.so.0 FAudio-19.05_1 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1 diff --git a/srcpkgs/grpc/patches/google-sucks.patch b/srcpkgs/grpc/patches/google-sucks.patch index 6231f4730e..cb8ca07bdc 100644 --- a/srcpkgs/grpc/patches/google-sucks.patch +++ b/srcpkgs/grpc/patches/google-sucks.patch @@ -1,11 +1,9 @@ An all-in-one patch that fixes several issues: 1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl) -2) generic stacktrace implementation only works on glibc (disabled on musl) -3) powerpc stacktrace implementation only works on glibc (disabled on musl) -4) powerpc stacktrace implementation has ppc64 assumptions (fixed) -5) examine_stack.cpp makes glibc assumptions on powerpc (fixed) -6) randen_hwaes does not build on all ppc (fixed) +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) --- third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc +++ third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc @@ -40,7 +38,7 @@ An all-in-one patch that fixes several issues: #else --- third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc +++ third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc -@@ -23,6 +23,10 @@ +@@ -27,6 +27,10 @@ #include #include @@ -51,7 +49,7 @@ An all-in-one patch that fixes several issues: #include "absl/base/attributes.h" #include "absl/base/internal/raw_logging.h" #include "absl/base/macros.h" -@@ -51,8 +55,10 @@ +@@ -55,8 +59,10 @@ return reinterpret_cast(context->uc_mcontext.pc); #elif defined(__powerpc64__) return reinterpret_cast(context->uc_mcontext.gp_regs[32]); @@ -65,35 +63,15 @@ An all-in-one patch that fixes several issues: #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 -@@ -34,13 +34,13 @@ - # if defined(__i386__) || defined(__x86_64__) +@@ -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__) + "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__) - #define ABSL_STACKTRACE_INL_HEADER \ - "absl/debugging/internal/stacktrace_aarch64-inl.inc" --# elif defined(__arm__) -+# elif defined(__arm__) && defined(__GLIBC__) - // Note: When using glibc this may require -funwind-tables to function properly. - #define ABSL_STACKTRACE_INL_HEADER \ - "absl/debugging/internal/stacktrace_generic-inl.inc" -@@ -49,10 +49,10 @@ - "absl/debugging/internal/stacktrace_unimplemented-inl.inc" - # endif - #else // defined(NO_FRAME_POINTER) --# if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) -+# if (defined(__i386__) || defined(__x86_64__) || defined(__aarch64__)) && defined(__GLIBC__) - #define ABSL_STACKTRACE_INL_HEADER \ - "absl/debugging/internal/stacktrace_generic-inl.inc" --# elif defined(__ppc__) || defined(__PPC__) -+# elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__) - #define ABSL_STACKTRACE_INL_HEADER \ - "absl/debugging/internal/stacktrace_generic-inl.inc" - # else + "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 @@ @@ -110,13 +88,3 @@ An all-in-one patch that fixes several issues: // Check that alleged sp before signal is nonnull and is reasonably // aligned. if (sp_before_signal != nullptr && ---- third_party/abseil-cpp/absl/random/internal/randen_hwaes.cc -+++ third_party/abseil-cpp/absl/random/internal/randen_hwaes.cc -@@ -141,6 +141,7 @@ ABSL_NAMESPACE_END - #include - // #defines vector __vector; in C++, this is bad form. - #undef vector -+#undef bool - - // Rely on the PowerPC AltiVec vector operations for accelerated AES - // instructions. GCC support of the PPC vector types is described in: diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template index 0968bb1ae2..4afd2a6dad 100644 --- a/srcpkgs/grpc/template +++ b/srcpkgs/grpc/template @@ -1,8 +1,8 @@ # Template file for 'grpc' pkgname=grpc -version=1.33.2 -revision=2 -_abseilver=df3ea785d8c30a9503321a3d35ee7d35808f190d +version=1.34.0 +revision=1 +_abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON -DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package @@ -13,18 +13,19 @@ hostmakedepends="which protobuf" makedepends="zlib-devel c-ares-devel libressl-devel libprotoc-devel protobuf-devel gperftools-devel re2-devel" short_desc="High performance, open source, general RPC framework" -maintainer="Orphaned " +maintainer="Andrew J. Hesford " license="Apache-2.0" homepage="https://github.com/grpc/grpc" distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz" -checksum="2060769f2d4b0d3535ba594b2ab614d7f68a492f786ab94b4318788d45e3278a - f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a" +checksum="7372a881122cd85a7224435a1d58bc5e11c88d4fb98a64b83f36f3d1c2f16d39 + 3d74cdc98b42fd4257d91f652575206de195e2c824fcd8d6e6d227f85cb143ef" if [ "$CROSS_BUILD" ]; then # need host grpc_cpp_plugin hostmakedepends+=" grpc" fi + if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"