* update grpc to 1.38.0-2

This commit is contained in:
Alexander Baldeck 2021-05-26 02:38:19 +02:00
parent 64029f96e3
commit 555c105d4d
3 changed files with 12 additions and 79 deletions

View File

@ -5,10 +5,10 @@
pkgbase='grpc'
pkgname=('grpc' 'python-grpcio' 'php-grpc' 'php7-grpc' 'grpc-cli')
pkgver=1.36.2
pkgver=1.38.0
_gtestver=c9ccac7cb7345901884aabf5d1a786cfa6e2f397
_abseilcppver=20200923.2
pkgrel=1
_abseilcppver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
pkgrel=2
pkgdesc="High performance, open source, general RPC framework that puts mobile and HTTP/2 first."
arch=(x86_64 powerpc64le powerpc)
url='https://grpc.io'
@ -17,10 +17,10 @@ makedepends=('re2' 're2c' 'protobuf' 'php' 'php7' 'c-ares' 'openssl' 'chrpath' '
'cmake' 'benchmark' 'python-setuptools')
source=("https://github.com/grpc/grpc/archive/v$pkgver/$pkgbase-$pkgver.tar.gz"
"https://github.com/google/googletest/archive/$_gtestver/googletest-$_gtestver.tar.gz"
"https://github.com/abseil/abseil-cpp/archive/$_abseilcppver/abseil-cpp-$_abseilcppver.tar.gz")
sha256sums=('51403542b19e9ed5d3b6551ce4a828e17883a1593d4ca408b098f04b0767d202'
"https://github.com/abseil/abseil-cpp/archive/$_abseilcppver/abseil-cpp-$_abseilcppver.tar.gz")
sha256sums=('abd9e52c69000f2c051761cfa1f12d52d8b7647b6c66828a91d462e796f2aede'
'443d383db648ebb8e391382c0ab63263b7091d03197f304390baac10f178a468'
'bf3f13b13a0095d926b25640e060f7e13881bd8a792705dd9e161f3c2b9aa976')
'35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee')
prepare() {
cd "$srcdir/$pkgbase-$pkgver"
@ -38,6 +38,11 @@ prepare() {
build() {
cd "$srcdir/$pkgbase-$pkgver/build"
case "${CARCH}" in
powerpc) EXTRA_CMAKE_FLAGS="-DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" ;;
esac
cmake \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" \
@ -50,7 +55,7 @@ build() {
-DgRPC_SSL_PROVIDER=package \
-DgRPC_ZLIB_PROVIDER=package \
-DgRPC_RE2_PROVIDER=package \
-DgRPC_BENCHMARK_PROVIDER=package \
-DgRPC_BENCHMARK_PROVIDER=package ${EXTRA_CMAKE_FLAGS} \
..
make

View File

@ -1,57 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef11396..dd10886 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,7 @@ set(gRPC_INSTALL_CMAKEDIR "lib/cmake/${PACKAGE_NAME}" CACHE STRING "Installation
set(gRPC_INSTALL_SHAREDIR "share/grpc" CACHE STRING "Installation directory for root certificates")
# Options
+option(gRPC_BUILD_CLI "Build cli" ON)
option(gRPC_BUILD_TESTS "Build tests" OFF)
option(gRPC_BUILD_CODEGEN "Build codegen" ON)
option(gRPC_BUILD_CSHARP_EXT "Build C# extensions" ON)
@@ -84,7 +85,7 @@ set_property(CACHE gRPC_PROTOBUF_PROVIDER PROPERTY STRINGS "module" "package")
set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package")
set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE")
-if(gRPC_BUILD_TESTS)
+if(gRPC_BUILD_TESTS OR gRPC_BUILD_CLI)
set(gRPC_GFLAGS_PROVIDER "module" CACHE STRING "Provider of gflags library")
set_property(CACHE gRPC_GFLAGS_PROVIDER PROPERTY STRINGS "module" "package")
@@ -4278,7 +4279,7 @@ target_link_libraries(b64_test
endif()
-if(gRPC_BUILD_TESTS)
+if(gRPC_BUILD_TESTS OR gRPC_BUILD_CLI)
add_executable(bad_server_response_test
test/core/end2end/bad_server_response_test.cc
@@ -4401,7 +4402,7 @@ target_link_libraries(bin_decoder_test
endif()
-if(gRPC_BUILD_TESTS)
+if(gRPC_BUILD_TESTS OR gRPC_BUILD_CLI)
add_executable(bin_encoder_test
test/core/transport/chttp2/bin_encoder_test.cc
@@ -5167,7 +5168,7 @@ target_link_libraries(fake_resolver_test
endif()
-if(gRPC_BUILD_TESTS)
+if(gRPC_BUILD_TESTS OR gRPC_BUILD_CLI)
add_executable(fake_transport_security_test
test/core/tsi/fake_transport_security_test.cc
@@ -10762,7 +10763,7 @@ target_link_libraries(global_config_test
endif()
-if(gRPC_BUILD_TESTS)
+if(gRPC_BUILD_TESTS OR gRPC_BUILD_CLI)
add_executable(grpc_cli
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.cc

View File

@ -1,15 +0,0 @@
diff --git a/Makefile b/Makefile
index d8a0e01..9596d6c 100644
--- a/Makefile
+++ b/Makefile
@@ -3022,8 +3022,8 @@ install-headers_c:
install-headers_cxx:
$(E) "[INSTALL] Installing public C++ headers"
- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
+ $(Q) DIRS="$(shell dirname $(PUBLIC_HEADERS_CXX) | uniq )"; for d in $$DIRS; do [ ! -d $(prefix)/$$d ] && $(INSTALL) -d $(prefix)/$$d || : ; done
+ $(Q) for f in $(PUBLIC_HEADERS_CXX); do $(INSTALL) $$f $(prefix)/$$f ; done
install-static: install-static_c install-static_cxx