grpc: update to 1.38.0.

This commit is contained in:
Andrew J. Hesford 2021-05-24 09:33:47 -04:00
parent 136b995286
commit 22eea53ba5
4 changed files with 25 additions and 66 deletions

View file

@ -3618,18 +3618,18 @@ liboblibs.so.0.1 oblibs-0.1.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.15 grpc-1.36.0_2
libgpr.so.15 grpc-1.36.0_2
libgrpc++.so.1.37 grpc-1.37.1_1
libgrpc++_alts.so.1.37 grpc-1.37.1_1
libgrpc++_error_details.so.1.37 grpc-1.37.1_1
libgrpc++_reflection.so.1.37 grpc-1.37.1_1
libgrpc++_unsecure.so.1.37 grpc-1.37.1_1
libgrpc.so.15 grpc-1.36.0_2
libgrpc_plugin_support.so.1.37 grpc-1.37.1_1
libgrpc_unsecure.so.15 grpc-1.36.0_2
libgrpcpp_channelz.so.1.37 grpc-1.37.1_1
libupb.so.15 grpc-1.36.0_2
libaddress_sorting.so.16 grpc-1.38.0_1
libgpr.so.16 grpc-1.38.0_1
libgrpc++.so.1.38 grpc-1.38.0_1
libgrpc++_alts.so.1.38 grpc-1.38.0_1
libgrpc++_error_details.so.1.38 grpc-1.38.0_1
libgrpc++_reflection.so.1.38 grpc-1.38.0_1
libgrpc++_unsecure.so.1.38 grpc-1.38.0_1
libgrpc.so.16 grpc-1.38.0_1
libgrpc_plugin_support.so.1.38 grpc-1.38.0_1
libgrpc_unsecure.so.16 grpc-1.38.0_1
libgrpcpp_channelz.so.1.38 grpc-1.38.0_1
libupb.so.16 grpc-1.38.0_1
libircclient.so.1 libircclient-1.10_5
libFAudio.so.0 FAudio-19.05_1
libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1

View file

@ -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 <csignal>
#include <cstdio>
+#if defined(__powerpc__)
+#include <asm/ptrace.h>
+#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<void*>(context->uc_mcontext.pc);
#elif defined(__powerpc64__)
return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
-#elif defined(__powerpc__)
+#elif defined(__powerpc__) && defined(__GLIBC__)
return reinterpret_cast<void*>(context->uc_mcontext.regs->nip);
+#elif defined(__powerpc__)
+ return reinterpret_cast<void*>(((struct pt_regs *)context->uc_regs)->nip);
#elif defined(__riscv)
return reinterpret_cast<void*>(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<const ucontext_t*>(uc);
+#if defined(__powerpc64__)
void **const sp_before_signal =
reinterpret_cast<void**>(signal_context->uc_mcontext.gp_regs[PT_R1]);
+#else
+ void **const sp_before_signal =
+ reinterpret_cast<void**>(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 &&

View file

@ -6,29 +6,29 @@ location because the full abseil installation is not provided.
diff -ur third_party/abseil-cpp/CMakeLists.txt third_party/abseil-cpp/CMakeLists.txt
--- third_party/abseil-cpp/CMakeLists.txt
+++ third_party/abseil-cpp/CMakeLists.txt
@@ -42,6 +42,7 @@
endif (POLICY CMP0077)
@@ -46,6 +46,7 @@
OPTION(BUILD_TESTING "Build tests" OFF)
project(absl CXX)
project(absl LANGUAGES CXX VERSION 20210324)
+set(BUILD_SHARED_LIBS OFF)
include(CTest)
# Output directory is correct by default for most build setups. However, when
# building Abseil as a DLL, it is important to have the DLL in the same
@@ -52,7 +53,7 @@
@@ -57,7 +58,7 @@
# when absl is included as subproject (i.e. using add_subdirectory(abseil-cpp))
# in the source tree of a project that uses it, install rules are disabled.
if(NOT "^${CMAKE_SOURCE_DIR}$" STREQUAL "^${PROJECT_SOURCE_DIR}$")
if(NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
- option(ABSL_ENABLE_INSTALL "Enable install rule" OFF)
+ option(ABSL_ENABLE_INSTALL "Enable install rule" ON)
else()
option(ABSL_ENABLE_INSTALL "Enable install rule" ON)
endif()
@@ -167,7 +168,7 @@
@@ -176,7 +177,7 @@
endif() # absl_VERSION
install(DIRECTORY absl
- DESTINATION ${ABSL_INSTALL_INCLUDEDIR}
+ DESTINATION ${ABSL_INSTALL_INCLUDEDIR}/grpc_absl
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/grpc_absl
FILES_MATCHING
PATTERN "*.inc"
PATTERN "*.h"

View file

@ -1,8 +1,8 @@
# Template file for 'grpc'
pkgname=grpc
version=1.37.1
version=1.38.0
revision=1
_abseilver=6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c
_abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON
-DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package
@ -18,8 +18,8 @@ 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="acf247ec3a52edaee5dee28644a4e485c5e5badf46bdb24a80ca1d76cb8f1174
62c27e7a633e965a2f40ff16b487c3b778eae440bab64cad83b34ef1cbe3aa93"
checksum="abd9e52c69000f2c051761cfa1f12d52d8b7647b6c66828a91d462e796f2aede
35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
if [ "$CROSS_BUILD" ]; then
# need host grpc_cpp_plugin