diff options
| author | Andy Postnikov <apostnikov@gmail.com> | 2018-11-21 21:53:37 +0200 |
|---|---|---|
| committer | Andy Postnikov <apostnikov@gmail.com> | 2018-11-22 02:08:35 +0200 |
| commit | da468dc8560dd43d1c24f3a46532f0b66dfef036 (patch) | |
| tree | 46322704b044b81300284337dcafba4d81e21573 /testing | |
| parent | f0e3243cbf435b49ddcc0a65ae57d023f98b171c (diff) | |
| download | aports-da468dc8560dd43d1c24f3a46532f0b66dfef036.tar.bz2 aports-da468dc8560dd43d1c24f3a46532f0b66dfef036.tar.xz | |
testing/grpc: upgrade to 1.16.1
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/grpc/APKBUILD | 9 | ||||
| -rw-r--r-- | testing/grpc/disable-Werror.patch | 23 |
2 files changed, 5 insertions, 27 deletions
diff --git a/testing/grpc/APKBUILD b/testing/grpc/APKBUILD index faa834ab3b..ed93d84060 100644 --- a/testing/grpc/APKBUILD +++ b/testing/grpc/APKBUILD @@ -1,15 +1,14 @@ # Contributor: wener <wenermail@gmail.com> # Maintainer: wener <wenermail@gmail.com> pkgname=grpc -pkgver=1.14.2 -pkgrel=1 +pkgver=1.16.1 +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" -depends_dev="protobuf-dev" 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 @@ -44,7 +43,7 @@ cli() { make install-grpc-cli prefix="$subpkgdir/usr" } -sha512sums="1fca05a01fcae3bcaa8aeb57fb8e4a69d92d4d4d42e0612e9a7b3652a3f4e1b006a7559aea95cadae614479f4ac6ed14876b81fca0365967d246a5b7888a8385 grpc-1.14.2.tar.gz +sha512sums="2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d grpc-1.16.1.tar.gz dd55ab745c43c5c953d8cebd2fb44b4bb2cb87c95194965bffd0bd8219332d5f073c22947c8a8b1e2652805dff1cff4b93fe69645d4c0d635f98ae2cf54af14a googletest-ec44c6c1675c25b9827aacd08c02433cccde7780.tar.gz 7fa146ce86ddd4f160bb1ca9ff01cb7aca6b2b8c9aa50e4fa6b84504b9117b104be0d1e31ccb452d846549dfe1e9012ceccfcdc1f2357ed567621d71fb8b08c5 01-chttp2-maybe-uninitialized.patch -9c6cf4044922de4567a769c932bdefa554a46a74efb4d9a580a0d8922f7a7faf3b6f8fbb697832fcb48f215dbe820f7de7d69b024159c9f2f4e343b6eaaa8131 disable-Werror.patch" +d50885978466137e595ccb8e45fc7e283ff18b61775c4e0d92c0f56310c719802e591816955d800e71aab1da36b52f938f32d46bed3c230dd2b1b08dca7f2a91 disable-Werror.patch" diff --git a/testing/grpc/disable-Werror.patch b/testing/grpc/disable-Werror.patch index 37d9e0482c..13df26bed6 100644 --- a/testing/grpc/disable-Werror.patch +++ b/testing/grpc/disable-Werror.patch @@ -47,32 +47,11 @@ index b1a7553..8b5283e 100644 ifeq ($(HAS_WORKING_NO_MAYBE_UNINITIALIZED),true) W_NO_MAYBE_UNINITIALIZED=-Wno-maybe-uninitialized @@ -352,7 +352,7 @@ CXXFLAGS += -std=c++11 - ifeq ($(SYSTEM),Darwin) 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 -diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc -index 8f3ad6c..34bb081 100644 ---- a/src/core/lib/surface/channel.cc -+++ b/src/core/lib/surface/channel.cc -@@ -82,7 +82,7 @@ grpc_channel* grpc_channel_create_with_builder( - char* target = gpr_strdup(grpc_channel_stack_builder_get_target(builder)); - grpc_channel_args* args = grpc_channel_args_copy( - grpc_channel_stack_builder_get_channel_arguments(builder)); -- grpc_channel* channel; -+ grpc_channel* channel = {}; - if (channel_stack_type == GRPC_SERVER_CHANNEL) { - GRPC_STATS_INC_SERVER_CHANNELS_CREATED(); - } else { -@@ -100,7 +100,6 @@ grpc_channel* grpc_channel_create_with_builder( - return channel; - } - -- memset(channel, 0, sizeof(*channel)); - channel->target = target; - channel->is_client = grpc_channel_stack_type_is_client(channel_stack_type); - size_t channel_tracer_max_nodes = 0; // default to off |