Date: Wednesday, February 5, 2020 @ 09:06:31 Author: mtorromeo Revision: 562923
archrelease: copy trunk to community-x86_64 Added: grpc/repos/community-x86_64/PKGBUILD (from rev 562922, grpc/trunk/PKGBUILD) grpc/repos/community-x86_64/makefile-disable-ldconfig.patch (from rev 562922, grpc/trunk/makefile-disable-ldconfig.patch) grpc/repos/community-x86_64/makefile-disable-strip.patch (from rev 562922, grpc/trunk/makefile-disable-strip.patch) grpc/repos/community-x86_64/makefile-remove-extra-semi.patch (from rev 562922, grpc/trunk/makefile-remove-extra-semi.patch) grpc/repos/community-x86_64/makefile.patch (from rev 562922, grpc/trunk/makefile.patch) Deleted: grpc/repos/community-x86_64/PKGBUILD grpc/repos/community-x86_64/makefile.patch ----------------------------------+ PKGBUILD | 214 +++++++++++++++++++------------------ makefile-disable-ldconfig.patch | 40 ++++++ makefile-disable-strip.patch | 40 ++++++ makefile-remove-extra-semi.patch | 17 ++ makefile.patch | 30 ++--- 5 files changed, 222 insertions(+), 119 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-02-05 09:06:14 UTC (rev 562922) +++ PKGBUILD 2020-02-05 09:06:31 UTC (rev 562923) @@ -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.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 -} Copied: grpc/repos/community-x86_64/PKGBUILD (from rev 562922, grpc/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-02-05 09:06:31 UTC (rev 562923) @@ -0,0 +1,110 @@ +# 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.27.0 +_gtestver=c9ccac7cb7345901884aabf5d1a786cfa6e2f397 +_abseilcppver=37dd2562ec830d547a1524bb306be313ac3f2556 +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') +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" + "makefile.patch" + "makefile-remove-extra-semi.patch" + "makefile-disable-strip.patch" + "makefile-disable-ldconfig.patch") +sha256sums=('3ccc4e5ae8c1ce844456e39cc11f1c991a7da74396faabe83d779836ef449bce' + '443d383db648ebb8e391382c0ab63263b7091d03197f304390baac10f178a468' + '19391fb4882601a65cb648d638c11aa301ce5f525ef02da1a9eafd22f72d7c59' + 'f292cb387f0cf7567e6e8004a6dd57bf0375abbaa8968dcd97cbd7e72409670f' + 'e2b70ba6c75de1f50bd33686e01b3fe35f08e74556c5cbc9755c758d700815d8' + 'da7ef0f69f2318ccd50bbb011b07bd973a8609e098b016fdec25833ff8fccd9a' + '1d910fb15f93f7d4f74a11c092bc427f0624aedb4185af143640afa137e1fb73') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + for patch in "$srcdir/"*.patch; do + patch -p1 -i "$patch" + done + + 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 +} + +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/makefile-disable-ldconfig.patch (from rev 562922, grpc/trunk/makefile-disable-ldconfig.patch) =================================================================== --- makefile-disable-ldconfig.patch (rev 0) +++ makefile-disable-ldconfig.patch 2020-02-05 09:06:31 UTC (rev 562923) @@ -0,0 +1,40 @@ +diff --git a/Makefile b/Makefile +index 9546b7a..f845de2 100644 +--- a/Makefile ++++ b/Makefile +@@ -3288,11 +3288,6 @@ else ifneq ($(SYSTEM),Darwin) + $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libupb.so.9 + $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libupb.so + endif +-ifneq ($(SYSTEM),MINGW32) +-ifneq ($(SYSTEM),Darwin) +- $(Q) ldconfig || true +-endif +-endif + + + install-shared_cxx: shared_cxx install-shared_c install-pkg-config_cxx +@@ -3350,11 +3345,6 @@ else ifneq ($(SYSTEM),Darwin) + $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpcpp_channelz.so.1 + $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpcpp_channelz.so + endif +-ifneq ($(SYSTEM),MINGW32) +-ifneq ($(SYSTEM),Darwin) +- $(Q) ldconfig || true +-endif +-endif + + + install-shared_csharp: shared_csharp strip-shared_csharp +@@ -3367,11 +3357,6 @@ else ifneq ($(SYSTEM),Darwin) + $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/lib/libgrpc_csharp_ext.so.2 + $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/lib/libgrpc_csharp_ext.so + endif +-ifneq ($(SYSTEM),MINGW32) +-ifneq ($(SYSTEM),Darwin) +- $(Q) ldconfig || true +-endif +-endif + + + install-plugins: $(PROTOC_PLUGINS) Copied: grpc/repos/community-x86_64/makefile-disable-strip.patch (from rev 562922, grpc/trunk/makefile-disable-strip.patch) =================================================================== --- makefile-disable-strip.patch (rev 0) +++ makefile-disable-strip.patch 2020-02-05 09:06:31 UTC (rev 562923) @@ -0,0 +1,40 @@ +diff --git a/Makefile b/Makefile +index d65551c..9546b7a 100644 +--- a/Makefile ++++ b/Makefile +@@ -3191,7 +3191,7 @@ install-headers_cxx: + + install-static: install-static_c install-static_cxx + +-install-static_c: static_c strip-static_c install-pkg-config_c ++install-static_c: static_c install-pkg-config_c + $(E) "[INSTALL] Installing libaddress_sorting.a" + $(Q) $(INSTALL) -d $(prefix)/lib + $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(prefix)/lib/libaddress_sorting.a +@@ -3211,7 +3211,7 @@ install-static_c: static_c strip-static_c install-pkg-config_c + $(Q) $(INSTALL) -d $(prefix)/lib + $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libupb.a $(prefix)/lib/libupb.a + +-install-static_cxx: static_cxx strip-static_cxx install-pkg-config_cxx ++install-static_cxx: static_cxx install-pkg-config_cxx + $(E) "[INSTALL] Installing libgrpc++.a" + $(Q) $(INSTALL) -d $(prefix)/lib + $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(prefix)/lib/libgrpc++.a +@@ -3233,7 +3233,7 @@ install-static_cxx: static_cxx strip-static_cxx install-pkg-config_cxx + + + +-install-shared_c: shared_c strip-shared_c install-pkg-config_c ++install-shared_c: shared_c install-pkg-config_c + $(E) "[INSTALL] Installing $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" + $(Q) $(INSTALL) -d $(prefix)/lib + $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/$(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) +@@ -3295,7 +3295,7 @@ endif + endif + + +-install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-config_cxx ++install-shared_cxx: shared_cxx install-shared_c install-pkg-config_cxx + $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)" + $(Q) $(INSTALL) -d $(prefix)/lib + $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) Copied: grpc/repos/community-x86_64/makefile-remove-extra-semi.patch (from rev 562922, grpc/trunk/makefile-remove-extra-semi.patch) =================================================================== --- makefile-remove-extra-semi.patch (rev 0) +++ makefile-remove-extra-semi.patch 2020-02-05 09:06:31 UTC (rev 562923) @@ -0,0 +1,17 @@ +diff --git a/Makefile b/Makefile +index 694f0f2..50eec93 100644 +--- a/Makefile ++++ b/Makefile +@@ -315,12 +315,6 @@ ifeq ($(HAS_WORKING_NO_CXX14_COMPAT),true) + W_NO_CXX14_COMPAT=-Wno-c++14-compat + endif + +-CHECK_EXTRA_SEMI_WORKS_CMD = $(CC) -std=c99 -Werror -Wextra-semi -o $(TMPOUT) -c test/build/extra-semi.c +-HAS_WORKING_EXTRA_SEMI = $(shell $(CHECK_EXTRA_SEMI_WORKS_CMD) 2> /dev/null && echo true || echo false) +-ifeq ($(HAS_WORKING_EXTRA_SEMI),true) +-W_EXTRA_SEMI=-Wextra-semi +-NO_W_EXTRA_SEMI=-Wno-extra-semi +-endif + CHECK_NO_SHIFT_NEGATIVE_VALUE_WORKS_CMD = $(CC) -std=c99 -Werror -Wno-shift-negative-value -o $(TMPOUT) -c test/build/no-shift-negative-value.c + HAS_WORKING_NO_SHIFT_NEGATIVE_VALUE = $(shell $(CHECK_NO_SHIFT_NEGATIVE_VALUE_WORKS_CMD) 2> /dev/null && echo true || echo false) + ifeq ($(HAS_WORKING_NO_SHIFT_NEGATIVE_VALUE),true) Deleted: makefile.patch =================================================================== --- makefile.patch 2020-02-05 09:06:14 UTC (rev 562922) +++ makefile.patch 2020-02-05 09:06:31 UTC (rev 562923) @@ -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 562922, grpc/trunk/makefile.patch) =================================================================== --- makefile.patch (rev 0) +++ makefile.patch 2020-02-05 09:06:31 UTC (rev 562923) @@ -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 +