Date: Friday, May 29, 2020 @ 17:24:43 Author: mtorromeo Revision: 637179
archrelease: copy trunk to community-staging-x86_64 Added: grpc/repos/community-staging-x86_64/PKGBUILD (from rev 637178, grpc/trunk/PKGBUILD) grpc/repos/community-staging-x86_64/cmake-cli.patch (from rev 637178, grpc/trunk/cmake-cli.patch) Deleted: grpc/repos/community-staging-x86_64/PKGBUILD grpc/repos/community-staging-x86_64/cmake-cli.patch -----------------+ PKGBUILD | 236 +++++++++++++++++++++++++++--------------------------- cmake-cli.patch | 114 +++++++++++++------------- 2 files changed, 175 insertions(+), 175 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-05-29 17:24:28 UTC (rev 637178) +++ PKGBUILD 2020-05-29 17:24:43 UTC (rev 637179) @@ -1,118 +0,0 @@ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> -# Contributor: Aleksey Filippov <sarum...@gmail.com> -# Contributor: Victor Aurélio Santos <victoraur.san...@gmail.com> - -pkgbase='grpc' -pkgname=('grpc' 'python-grpcio' 'php-grpc' 'grpc-cli') -pkgver=1.29.0 -_gtestver=c9ccac7cb7345901884aabf5d1a786cfa6e2f397 -_abseilcppver=20200225.2 -_gbenchmark=1.5.0 -pkgrel=1 -pkgdesc="High performance, open source, general RPC framework that puts mobile and HTTP/2 first." -arch=('x86_64') -url='https://grpc.io' -license=('BSD') -makedepends=('re2c' 'protobuf' 'php' 'c-ares' 'openssl' 'chrpath' 'gflags' 'cython' 'cmake') -source=("https://github.com/$pkgname/$pkgname/archive/v$pkgver/$pkgname-$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" - "https://github.com/google/benchmark/archive/v$_gbenchmark/google-benchmark-$_gbenchmark.tar.gz") -sha256sums=('c0a6b40a222e51bea5c53090e9e65de46aee2d84c7fa7638f09cb68c3331b983' - '443d383db648ebb8e391382c0ab63263b7091d03197f304390baac10f178a468' - 'f41868f7a938605c92936230081175d1eae87f6ea2c248f41077c8f88316f111' - '3c6a165b6ecc948967a1ead710d4a181d7b0fbcaa183ef7ea84604994966221a') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - ln -sf "$srcdir/googletest-$_gtestver/"{googlemock,googletest} \ - third_party/googletest - - rm -rf third_party/abseil-cpp - ln -s "$srcdir/abseil-cpp-$_abseilcppver/" third_party/abseil-cpp - - rm -rf third_party/benchmark - ln -s "$srcdir/benchmark-$_gbenchmark/" third_party/benchmark - - sed '/TARGET gflags::gflags/i \ set(_gRPC_GFLAGS_LIBRARIES gflags)' -i cmake/gflags.cmake - - mkdir build - cd build - cmake \ - -DgRPC_INSTALL=ON \ - -DBUILD_SHARED_LIBS=ON \ - -DgRPC_BUILD_TESTS=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DgRPC_CARES_PROVIDER=package \ - -DgRPC_PROTOBUF_PROVIDER=package \ - -DgRPC_SSL_PROVIDER=package \ - -DgRPC_ZLIB_PROVIDER=package \ - -DgRPC_GFLAGS_PROVIDER=package \ - -DBENCHMARK_HAS_CXX03_FLAG=OFF \ - .. -} - -build() { - cd "$srcdir/$pkgname-$pkgver/build" - make - export LDFLAGS="$LDFLAGS -L$PWD" - - # PHP - cd "$srcdir/$pkgbase-$pkgver/src/php/ext/$pkgbase" - phpize - ./configure --enable-grpc="$srcdir/$pkgname-$pkgver" - make - - # Python - cd "$srcdir/$pkgname-$pkgver" - GRPC_PYTHON_BUILD_WITH_CYTHON=1 \ - GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1 \ - GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1 \ - GRPC_PYTHON_BUILD_SYSTEM_CARES=1 \ - python setup.py build -} - -package_grpc() { - depends=('c-ares' 'protobuf' 'openssl') - - cd "$srcdir/$pkgbase-$pkgver/build" - make DESTDIR="$pkgdir" install - install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE -} - -package_python-grpcio() { - pkgdesc='Python language bindings for grpc, remote procedure call (RPC) framework' - depends=('c-ares' 'python') - - cd "$srcdir/$pkgbase-$pkgver" - python setup.py install -O1 --skip-build --root="$pkgdir" - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE -} - -package_php-grpc() { - pkgdesc='gRPC module for PHP' - depends=('grpc' 'php') - backup=('etc/php/conf.d/grpc.ini') - - # Install PHP extension. - cd "$srcdir/$pkgbase-$pkgver/src/php/ext/$pkgbase" - make install "INSTALL_ROOT=$pkgdir" - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - - # Remove RPATH - chrpath -d "$pkgdir/usr/lib/php/modules/grpc.so" - - echo ';extension=grpc.so' >grpc.ini - install -Dm644 grpc.ini "$pkgdir/etc/php/conf.d/grpc.ini" -} - -package_grpc-cli() { - pkgdesc='gRPC protocol buffers cli' - depends=('grpc' 'gflags') - - cd "$srcdir/$pkgbase-$pkgver" - install -dm0755 "$pkgdir/usr/lib" - cp -a build/libgrpc++_test_config.so* "$pkgdir/usr/lib/" - install -Dm0755 build/grpc_cli "$pkgdir/usr/bin/grpc_cli" - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE -} Copied: grpc/repos/community-staging-x86_64/PKGBUILD (from rev 637178, grpc/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-05-29 17:24:43 UTC (rev 637179) @@ -0,0 +1,118 @@ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Contributor: Aleksey Filippov <sarum...@gmail.com> +# Contributor: Victor Aurélio Santos <victoraur.san...@gmail.com> + +pkgbase='grpc' +pkgname=('grpc' 'python-grpcio' 'php-grpc' 'grpc-cli') +pkgver=1.29.1 +_gtestver=c9ccac7cb7345901884aabf5d1a786cfa6e2f397 +_abseilcppver=20200225.2 +_gbenchmark=1.5.0 +pkgrel=1 +pkgdesc="High performance, open source, general RPC framework that puts mobile and HTTP/2 first." +arch=('x86_64') +url='https://grpc.io' +license=('BSD') +makedepends=('re2c' 'protobuf' 'php' 'c-ares' 'openssl' 'chrpath' 'gflags' 'cython' 'cmake') +source=("https://github.com/$pkgname/$pkgname/archive/v$pkgver/$pkgname-$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" + "https://github.com/google/benchmark/archive/v$_gbenchmark/google-benchmark-$_gbenchmark.tar.gz") +sha256sums=('0343e6dbde66e9a31c691f2f61e98d79f3584e03a11511fad3f10e3667832a45' + '443d383db648ebb8e391382c0ab63263b7091d03197f304390baac10f178a468' + 'f41868f7a938605c92936230081175d1eae87f6ea2c248f41077c8f88316f111' + '3c6a165b6ecc948967a1ead710d4a181d7b0fbcaa183ef7ea84604994966221a') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + ln -sf "$srcdir/googletest-$_gtestver/"{googlemock,googletest} \ + third_party/googletest + + rm -rf third_party/abseil-cpp + ln -s "$srcdir/abseil-cpp-$_abseilcppver/" third_party/abseil-cpp + + rm -rf third_party/benchmark + ln -s "$srcdir/benchmark-$_gbenchmark/" third_party/benchmark + + sed '/TARGET gflags::gflags/i \ set(_gRPC_GFLAGS_LIBRARIES gflags)' -i cmake/gflags.cmake + + mkdir build + cd build + cmake \ + -DgRPC_INSTALL=ON \ + -DBUILD_SHARED_LIBS=ON \ + -DgRPC_BUILD_TESTS=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DgRPC_CARES_PROVIDER=package \ + -DgRPC_PROTOBUF_PROVIDER=package \ + -DgRPC_SSL_PROVIDER=package \ + -DgRPC_ZLIB_PROVIDER=package \ + -DgRPC_GFLAGS_PROVIDER=package \ + -DBENCHMARK_HAS_CXX03_FLAG=OFF \ + .. +} + +build() { + cd "$srcdir/$pkgname-$pkgver/build" + make + export LDFLAGS="$LDFLAGS -L$PWD" + + # PHP + cd "$srcdir/$pkgbase-$pkgver/src/php/ext/$pkgbase" + phpize + ./configure --enable-grpc="$srcdir/$pkgname-$pkgver" + make + + # Python + cd "$srcdir/$pkgname-$pkgver" + GRPC_PYTHON_BUILD_WITH_CYTHON=1 \ + GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1 \ + GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1 \ + GRPC_PYTHON_BUILD_SYSTEM_CARES=1 \ + python setup.py build +} + +package_grpc() { + depends=('c-ares' 'protobuf' 'openssl') + + cd "$srcdir/$pkgbase-$pkgver/build" + make DESTDIR="$pkgdir" install + install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +package_python-grpcio() { + pkgdesc='Python language bindings for grpc, remote procedure call (RPC) framework' + depends=('c-ares' 'python') + + cd "$srcdir/$pkgbase-$pkgver" + python setup.py install -O1 --skip-build --root="$pkgdir" + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +package_php-grpc() { + pkgdesc='gRPC module for PHP' + depends=('grpc' 'php') + backup=('etc/php/conf.d/grpc.ini') + + # Install PHP extension. + cd "$srcdir/$pkgbase-$pkgver/src/php/ext/$pkgbase" + make install "INSTALL_ROOT=$pkgdir" + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + + # Remove RPATH + chrpath -d "$pkgdir/usr/lib/php/modules/grpc.so" + + echo ';extension=grpc.so' >grpc.ini + install -Dm644 grpc.ini "$pkgdir/etc/php/conf.d/grpc.ini" +} + +package_grpc-cli() { + pkgdesc='gRPC protocol buffers cli' + depends=('grpc' 'gflags') + + cd "$srcdir/$pkgbase-$pkgver" + install -dm0755 "$pkgdir/usr/lib" + cp -a build/libgrpc++_test_config.so* "$pkgdir/usr/lib/" + install -Dm0755 build/grpc_cli "$pkgdir/usr/bin/grpc_cli" + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} Deleted: cmake-cli.patch =================================================================== --- cmake-cli.patch 2020-05-29 17:24:28 UTC (rev 637178) +++ cmake-cli.patch 2020-05-29 17:24:43 UTC (rev 637179) @@ -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 Copied: grpc/repos/community-staging-x86_64/cmake-cli.patch (from rev 637178, grpc/trunk/cmake-cli.patch) =================================================================== --- cmake-cli.patch (rev 0) +++ cmake-cli.patch 2020-05-29 17:24:43 UTC (rev 637179) @@ -0,0 +1,57 @@ +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