[arch-commits] Commit in grpc/repos/community-x86_64 (4 files)
Massimiliano Torromeo
mtorromeo at archlinux.org
Fri Oct 16 19:13:22 UTC 2020
Date: Friday, October 16, 2020 @ 19:13:21
Author: mtorromeo
Revision: 724874
archrelease: copy trunk to community-x86_64
Added:
grpc/repos/community-x86_64/PKGBUILD
(from rev 724873, grpc/trunk/PKGBUILD)
grpc/repos/community-x86_64/cmake-cli.patch
(from rev 724873, grpc/trunk/cmake-cli.patch)
Deleted:
grpc/repos/community-x86_64/PKGBUILD
grpc/repos/community-x86_64/cmake-cli.patch
-----------------+
PKGBUILD | 244 ++++++++++++++++++++++++++++--------------------------
cmake-cli.patch | 114 ++++++++++++-------------
2 files changed, 187 insertions(+), 171 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-10-16 19:13:06 UTC (rev 724873)
+++ PKGBUILD 2020-10-16 19:13:21 UTC (rev 724874)
@@ -1,114 +0,0 @@
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-# Contributor: Aleksey Filippov <sarum9in at gmail.com>
-# Contributor: Victor Aurélio Santos <victoraur.santos at gmail.com>
-
-pkgbase='grpc'
-pkgname=('grpc' 'python-grpcio' 'php-grpc' 'grpc-cli')
-pkgver=1.30.2
-_gtestver=c9ccac7cb7345901884aabf5d1a786cfa6e2f397
-_abseilcppver=20200225.2
-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' 'benchmark')
-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=('ba74b97a2f1b4e22ec5fb69d639d849d2069fb58ea7d6579a31f800af6fe3b6c'
- '443d383db648ebb8e391382c0ab63263b7091d03197f304390baac10f178a468'
- 'f41868f7a938605c92936230081175d1eae87f6ea2c248f41077c8f88316f111')
-
-prepare() {
- cd "$srcdir/$pkgbase-$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
-
- sed '/TARGET gflags::gflags/i \ set(_gRPC_GFLAGS_LIBRARIES gflags)' -i cmake/gflags.cmake
-
- mkdir build
-}
-
-build() {
- cd "$srcdir/$pkgbase-$pkgver/build"
- cmake \
- -DCMAKE_BUILD_TYPE=None \
- -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" \
- -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 \
- -DgRPC_BENCHMARK_PROVIDER=package \
- ..
-
- make
- export LDFLAGS="$LDFLAGS -L$PWD"
-
- # PHP
- cd "$srcdir/$pkgbase-$pkgver/src/php/ext/$pkgbase"
- phpize
- ./configure --enable-grpc="$srcdir/$pkgbase-$pkgver"
- make
-
- # Python
- cd "$srcdir/$pkgbase-$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' 'benchmark')
-
- 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-x86_64/PKGBUILD (from rev 724873, grpc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-10-16 19:13:21 UTC (rev 724874)
@@ -0,0 +1,130 @@
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Aleksey Filippov <sarum9in at gmail.com>
+# Contributor: Victor Aurélio Santos <victoraur.santos at gmail.com>
+
+pkgbase='grpc'
+pkgname=('grpc' 'python-grpcio' 'php-grpc' 'grpc-cli')
+pkgver=1.32.0
+_gtestver=c9ccac7cb7345901884aabf5d1a786cfa6e2f397
+_abseilcppver=20200225.2
+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=('re2' 're2c' 'protobuf' 'php' 'c-ares' 'openssl' 'chrpath' 'gflags' 'cython' 'cmake' 'benchmark')
+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"
+ "https://patch-diff.githubusercontent.com/raw/grpc/grpc/pull/24088/grpc-re2-pkgconfig.patch"
+ "grpcio-literal.patch::https://github.com/grpc/grpc/commit/9e0b427893b65b220faf8a31a6afdc67f6f41364.patch"
+ "https://patch-diff.githubusercontent.com/raw/grpc/grpc/pull/24450/grpcio-system-re2.patch"
+ "https://patch-diff.githubusercontent.com/raw/grpc/grpc/pull/24449/grpcio-no-boringssl-fix.patch")
+sha256sums=('f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a'
+ '443d383db648ebb8e391382c0ab63263b7091d03197f304390baac10f178a468'
+ 'f41868f7a938605c92936230081175d1eae87f6ea2c248f41077c8f88316f111'
+ '06508930d606d741849b8e39cb4ee042948a7317c8e10d4f04f517cdc95c6928'
+ '2a3049ad3aebf698f45325c5c789ed02d450d586732fd095b258b3d5b6556e54'
+ 'ad771906e2f8e1e04bd9bab4f0292e14c208ca12a87817d058f6def29338ea8f'
+ 'a105e796854fb726908a0b6f5501d50478f52afad6ed3e8aeffe5d30b855aead')
+
+prepare() {
+ cd "$srcdir/$pkgbase-$pkgver"
+ patch -p1 -i ../grpc-re2-pkgconfig.patch
+ patch -p1 -i ../grpcio-literal.patch
+ patch -p1 -i ../grpcio-system-re2.patch
+ patch -p1 -i ../grpcio-no-boringssl-fix.patch
+
+ 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
+
+ sed '/TARGET gflags::gflags/i \ set(_gRPC_GFLAGS_LIBRARIES gflags)' -i cmake/gflags.cmake
+
+ mkdir build
+}
+
+build() {
+ cd "$srcdir/$pkgbase-$pkgver/build"
+ cmake \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" \
+ -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 \
+ -DgRPC_RE2_PROVIDER=package \
+ -DgRPC_BENCHMARK_PROVIDER=package \
+ ..
+
+ make
+ export LDFLAGS="$LDFLAGS -L$PWD"
+
+ # PHP
+ cd "$srcdir/$pkgbase-$pkgver/src/php/ext/$pkgbase"
+ phpize
+ ./configure --enable-grpc="$srcdir/$pkgbase-$pkgver"
+ make
+
+ # Python
+ cd "$srcdir/$pkgbase-$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 \
+ GRPC_PYTHON_BUILD_SYSTEM_RE2=1 \
+ GRPC_BUILD_WITH_BORING_SSL_ASM=0 \
+ 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-10-16 19:13:06 UTC (rev 724873)
+++ cmake-cli.patch 2020-10-16 19:13:21 UTC (rev 724874)
@@ -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-x86_64/cmake-cli.patch (from rev 724873, grpc/trunk/cmake-cli.patch)
===================================================================
--- cmake-cli.patch (rev 0)
+++ cmake-cli.patch 2020-10-16 19:13:21 UTC (rev 724874)
@@ -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
More information about the arch-commits
mailing list