From 49b68d8cfcf731449422b07c5b33c264e04abb61 Mon Sep 17 00:00:00 2001 From: wener Date: Fri, 28 Jun 2019 04:05:37 +0800 Subject: community/grpc: move from testing --- community/grpc/01-chttp2-maybe-uninitialized.patch | 10 ++++ community/grpc/APKBUILD | 49 +++++++++++++++++++ community/grpc/disable-Werror.patch | 57 ++++++++++++++++++++++ 3 files changed, 116 insertions(+) create mode 100644 community/grpc/01-chttp2-maybe-uninitialized.patch create mode 100644 community/grpc/APKBUILD create mode 100644 community/grpc/disable-Werror.patch (limited to 'community/grpc') diff --git a/community/grpc/01-chttp2-maybe-uninitialized.patch b/community/grpc/01-chttp2-maybe-uninitialized.patch new file mode 100644 index 00000000000..b531fbc8829 --- /dev/null +++ b/community/grpc/01-chttp2-maybe-uninitialized.patch @@ -0,0 +1,10 @@ +--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc ++++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +@@ -978,6 +978,7 @@ + } else { + r = grpc_chttp2_begin_write(t); + } ++ #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" + if (r.writing) { + if (r.partial) { + GRPC_STATS_INC_HTTP2_PARTIAL_WRITES(); diff --git a/community/grpc/APKBUILD b/community/grpc/APKBUILD new file mode 100644 index 00000000000..43f6de887aa --- /dev/null +++ b/community/grpc/APKBUILD @@ -0,0 +1,49 @@ +# Contributor: wener +# Maintainer: wener +pkgname=grpc +pkgver=1.21.3 +pkgrel=0 +pkgdesc="The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#) " +url="https://grpc.io/" +giturl="https://github.com/grpc/grpc" +arch="all" +license="Apache2" +depends="protobuf" +makedepends="autoconf automake libtool libstdc++ protobuf-dev c-ares-dev openssl-dev gflags-dev gtest-dev zlib-dev yaml-dev" +subpackages="$pkgname-dev $pkgname-cli" +_googletest_rev=ec44c6c1675c25b9827aacd08c02433cccde7780 +source="$pkgname-$pkgver.tar.gz::https://github.com/grpc/grpc/archive/v$pkgver.tar.gz + googletest-$_googletest_rev.tar.gz::https://github.com/google/googletest/archive/$_googletest_rev.tar.gz + 01-chttp2-maybe-uninitialized.patch + disable-Werror.patch + " +builddir="$srcdir/$pkgname-$pkgver" +options="!check" + +unpack() { + default_unpack + cd "$srcdir" + rm -rf $pkgname-$pkgver/third_party/googletest + ln -sfn $PWD/googletest-$_googletest_rev/ $pkgname-$pkgver/third_party/googletest +} + +build() { + cd "$builddir" + make +} + +package() { + cd "$builddir" + make install prefix="$pkgdir/usr" + rm -f "$pkgdir/usr/share/grpc/roots.pem" +} + +cli() { + cd "$builddir" + make install-grpc-cli prefix="$subpkgdir/usr" +} + +sha512sums="a568627073a39ef8799672f8b365ac9a742468be969b528c518782f5783b22a9c519f5cf7e31d3c225e1d9a866f036beb850c7ddbe07ada6e6b7056684c64b2d grpc-1.21.3.tar.gz +dd55ab745c43c5c953d8cebd2fb44b4bb2cb87c95194965bffd0bd8219332d5f073c22947c8a8b1e2652805dff1cff4b93fe69645d4c0d635f98ae2cf54af14a googletest-ec44c6c1675c25b9827aacd08c02433cccde7780.tar.gz +7fa146ce86ddd4f160bb1ca9ff01cb7aca6b2b8c9aa50e4fa6b84504b9117b104be0d1e31ccb452d846549dfe1e9012ceccfcdc1f2357ed567621d71fb8b08c5 01-chttp2-maybe-uninitialized.patch +d50885978466137e595ccb8e45fc7e283ff18b61775c4e0d92c0f56310c719802e591816955d800e71aab1da36b52f938f32d46bed3c230dd2b1b08dca7f2a91 disable-Werror.patch" diff --git a/community/grpc/disable-Werror.patch b/community/grpc/disable-Werror.patch new file mode 100644 index 00000000000..13df26bed69 --- /dev/null +++ b/community/grpc/disable-Werror.patch @@ -0,0 +1,57 @@ +diff --git a/Makefile b/Makefile +index b1a7553..8b5283e 100644 +--- a/Makefile ++++ b/Makefile +@@ -300,37 +300,37 @@ else + TMPOUT = `mktemp /tmp/test-out-XXXXXX` + endif + +-CHECK_NO_CXX14_COMPAT_WORKS_CMD = $(CC) -std=c++11 -Werror -Wno-c++14-compat -o $(TMPOUT) -c test/build/no-c++14-compat.cc ++CHECK_NO_CXX14_COMPAT_WORKS_CMD = $(CC) -std=c++11 -Wno-c++14-compat -o $(TMPOUT) -c test/build/no-c++14-compat.cc + HAS_WORKING_NO_CXX14_COMPAT = $(shell $(CHECK_NO_CXX14_COMPAT_WORKS_CMD) 2> /dev/null && echo true || echo false) + ifeq ($(HAS_WORKING_NO_CXX14_COMPAT),true) + W_NO_CXX14_COMPAT=-Wno-c++14-compat + endif + +-CHECK_SHADOW_WORKS_CMD = $(CC) -std=c99 -Werror -Wshadow -o $(TMPOUT) -c test/build/shadow.c ++CHECK_SHADOW_WORKS_CMD = $(CC) -std=c99 -Wshadow -o $(TMPOUT) -c test/build/shadow.c + HAS_WORKING_SHADOW = $(shell $(CHECK_SHADOW_WORKS_CMD) 2> /dev/null && echo true || echo false) + ifeq ($(HAS_WORKING_SHADOW),true) + W_SHADOW=-Wshadow + NO_W_SHADOW=-Wno-shadow + endif +-CHECK_EXTRA_SEMI_WORKS_CMD = $(CC) -std=c99 -Werror -Wextra-semi -o $(TMPOUT) -c test/build/extra-semi.c ++CHECK_EXTRA_SEMI_WORKS_CMD = $(CC) -std=c99 -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 ++CHECK_NO_SHIFT_NEGATIVE_VALUE_WORKS_CMD = $(CC) -std=c99 -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) + W_NO_SHIFT_NEGATIVE_VALUE=-Wno-shift-negative-value + NO_W_NO_SHIFT_NEGATIVE_VALUE=-Wshift-negative-value + endif +-CHECK_NO_UNUSED_BUT_SET_VARIABLE_WORKS_CMD = $(CC) -std=c99 -Werror -Wno-unused-but-set-variable -o $(TMPOUT) -c test/build/no-unused-but-set-variable.c ++CHECK_NO_UNUSED_BUT_SET_VARIABLE_WORKS_CMD = $(CC) -std=c99 -Wno-unused-but-set-variable -o $(TMPOUT) -c test/build/no-unused-but-set-variable.c + HAS_WORKING_NO_UNUSED_BUT_SET_VARIABLE = $(shell $(CHECK_NO_UNUSED_BUT_SET_VARIABLE_WORKS_CMD) 2> /dev/null && echo true || echo false) + ifeq ($(HAS_WORKING_NO_UNUSED_BUT_SET_VARIABLE),true) + W_NO_UNUSED_BUT_SET_VARIABLE=-Wno-unused-but-set-variable + NO_W_NO_UNUSED_BUT_SET_VARIABLE=-Wunused-but-set-variable + endif +-CHECK_NO_MAYBE_UNINITIALIZED_WORKS_CMD = $(CC) -std=c99 -Werror -Wno-maybe-uninitialized -o $(TMPOUT) -c test/build/no-maybe-uninitialized.c ++CHECK_NO_MAYBE_UNINITIALIZED_WORKS_CMD = $(CC) -std=c99 -Wno-maybe-uninitialized -o $(TMPOUT) -c test/build/no-maybe-uninitialized.c + HAS_WORKING_NO_MAYBE_UNINITIALIZED = $(shell $(CHECK_NO_MAYBE_UNINITIALIZED_WORKS_CMD) 2> /dev/null && echo true || echo false) + ifeq ($(HAS_WORKING_NO_MAYBE_UNINITIALIZED),true) + W_NO_MAYBE_UNINITIALIZED=-Wno-maybe-uninitialized +@@ -352,7 +352,7 @@ CXXFLAGS += -std=c++11 + CXXFLAGS += -stdlib=libc++ + endif + CXXFLAGS += -Wnon-virtual-dtor +-CPPFLAGS += -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -Wno-deprecated-declarations -Ithird_party/nanopb -DPB_FIELD_32BIT ++CPPFLAGS += -g -Wall -Wextra -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -Wno-deprecated-declarations -Ithird_party/nanopb -DPB_FIELD_32BIT + COREFLAGS += -fno-rtti -fno-exceptions + LDFLAGS += -g + -- cgit v1.2.3