Date: Thursday, January 2, 2020 @ 08:27:59 Author: mtorromeo Revision: 546018
archrelease: copy trunk to community-x86_64 Added: grpc/repos/community-x86_64/PKGBUILD (from rev 546017, grpc/trunk/PKGBUILD) grpc/repos/community-x86_64/makefile.patch (from rev 546017, grpc/trunk/makefile.patch) Deleted: grpc/repos/community-x86_64/PKGBUILD grpc/repos/community-x86_64/makefile.patch ----------------+ PKGBUILD | 208 +++++++++++++++++++++++++++---------------------------- makefile.patch | 30 +++---- 2 files changed, 119 insertions(+), 119 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-01-02 08:27:44 UTC (rev 546017) +++ PKGBUILD 2020-01-02 08:27:59 UTC (rev 546018) @@ -1,104 +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.25.0 -_gtestver=1.8.1 -_upbver=931bbecbd3230ae7f22efa5d203639facc47f719 -pkgrel=4 -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') -source=("https://github.com/$pkgname/$pkgname/archive/v$pkgver/$pkgname-$pkgver.tar.gz" - "https://github.com/google/googletest/archive/release-$_gtestver/googletest-$_gtestver.tar.gz" - "https://github.com/protocolbuffers/upb/archive/$_upbver/upb-$_upbver.tar.gz" - "makefile.patch") -sha256sums=('ffbe61269160ea745e487f79b0fd06b6edd3d50c6d9123f053b5634737cf2f69' - '9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c' - '95150db57b51b65f3422c38953956e0f786945d842d76f8ab685fbcd93ab5caa' - 'f292cb387f0cf7567e6e8004a6dd57bf0375abbaa8968dcd97cbd7e72409670f') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - - patch -p1 -i "$srcdir/makefile.patch" - - sed -r 's/-Werror//g;/ldconfig/d;s/ strip-(static|shared)_c(xx)? / /' -i Makefile - - ln -sf "$srcdir/googletest-release-$_gtestver/"{googlemock,googletest} \ - third_party/googletest - - rm -rf third_party/upb - ln -s "$srcdir/upb-$_upbver" third_party/upb -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - export CFLAGS="$CFLAGS -Wno-unused-parameter" - export CXXFLAGS="$CXXFLAGS -Wno-unused-parameter" - - make prefix=/usr - make prefix=/usr grpc_cli - - # Don't install it as part of main package - mv bins/opt/grpc_cli . - - # Python - 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 - - # PHP - cd "$srcdir/$pkgbase-$pkgver/src/php/ext/$pkgbase" - phpize - LDFLAGS=-L"$srcdir/$pkgname-$pkgver/libs/opt" ./configure --enable-grpc="$srcdir/$pkgname-$pkgver" - make -} - -package_grpc() { - depends=('c-ares' 'protobuf' 'openssl') - - cd "$srcdir/$pkgbase-$pkgver" - make prefix="$pkgdir/usr" install - find "$pkgdir"/usr/{include,share,lib/pkgconfig} -type f -exec chmod a-x {} + - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE -} - -package_python-grpcio() { - 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() { - 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() { - depends=('c-ares' 'gflags' 'protobuf' 'openssl') - - cd "$srcdir/$pkgbase-$pkgver" - install -Dm755 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 546017, grpc/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-01-02 08:27:59 UTC (rev 546018) @@ -0,0 +1,104 @@ +# 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.26.0 +_gtestver=1.8.1 +_upbver=931bbecbd3230ae7f22efa5d203639facc47f719 +pkgrel=4 +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') +source=("https://github.com/$pkgname/$pkgname/archive/v$pkgver/$pkgname-$pkgver.tar.gz" + "https://github.com/google/googletest/archive/release-$_gtestver/googletest-$_gtestver.tar.gz" + "https://github.com/protocolbuffers/upb/archive/$_upbver/upb-$_upbver.tar.gz" + "makefile.patch") +sha256sums=('2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81' + '9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c' + '95150db57b51b65f3422c38953956e0f786945d842d76f8ab685fbcd93ab5caa' + 'f292cb387f0cf7567e6e8004a6dd57bf0375abbaa8968dcd97cbd7e72409670f') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + patch -p1 -i "$srcdir/makefile.patch" + + sed -r 's/-Werror//g;/ldconfig/d;s/ strip-(static|shared)_c(xx)? / /' -i Makefile + + ln -sf "$srcdir/googletest-release-$_gtestver/"{googlemock,googletest} \ + third_party/googletest + + rm -rf third_party/upb + ln -s "$srcdir/upb-$_upbver" third_party/upb +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + export CFLAGS="$CFLAGS -Wno-unused-parameter" + export CXXFLAGS="$CXXFLAGS -Wno-unused-parameter" + + make prefix=/usr + make prefix=/usr grpc_cli + + # Don't install it as part of main package + mv bins/opt/grpc_cli . + + # Python + 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 + + # PHP + cd "$srcdir/$pkgbase-$pkgver/src/php/ext/$pkgbase" + phpize + LDFLAGS=-L"$srcdir/$pkgname-$pkgver/libs/opt" ./configure --enable-grpc="$srcdir/$pkgname-$pkgver" + make +} + +package_grpc() { + depends=('c-ares' 'protobuf' 'openssl') + + cd "$srcdir/$pkgbase-$pkgver" + make prefix="$pkgdir/usr" install + find "$pkgdir"/usr/{include,share,lib/pkgconfig} -type f -exec chmod a-x {} + + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +package_python-grpcio() { + 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() { + 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() { + depends=('c-ares' 'gflags' 'protobuf' 'openssl') + + cd "$srcdir/$pkgbase-$pkgver" + install -Dm755 grpc_cli "$pkgdir"/usr/bin/grpc_cli + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} Deleted: makefile.patch =================================================================== --- makefile.patch 2020-01-02 08:27:44 UTC (rev 546017) +++ makefile.patch 2020-01-02 08:27:59 UTC (rev 546018) @@ -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 - Copied: grpc/repos/community-x86_64/makefile.patch (from rev 546017, grpc/trunk/makefile.patch) =================================================================== --- makefile.patch (rev 0) +++ makefile.patch 2020-01-02 08:27:59 UTC (rev 546018) @@ -0,0 +1,15 @@ +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 +