diff options
-rw-r--r-- | community/grpc/APKBUILD | 8 | ||||
-rw-r--r-- | community/grpc/disable-Werror.patch | 57 |
2 files changed, 3 insertions, 62 deletions
diff --git a/community/grpc/APKBUILD b/community/grpc/APKBUILD index e0d3088c43..5c7e71facc 100644 --- a/community/grpc/APKBUILD +++ b/community/grpc/APKBUILD @@ -1,8 +1,8 @@ # Contributor: wener <wenermail@gmail.com> # Maintainer: wener <wenermail@gmail.com> pkgname=grpc -pkgver=1.21.3 -pkgrel=2 +pkgver=1.25.0 +pkgrel=0 pkgdesc="The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#) " url="https://grpc.io/" giturl="https://github.com/grpc/grpc" @@ -15,7 +15,6 @@ _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 fix-install.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -46,8 +45,7 @@ cli() { mv "$pkgdir"/usr/bin/grpc_cli "$subpkgdir"/usr/bin/ } -sha512sums="a568627073a39ef8799672f8b365ac9a742468be969b528c518782f5783b22a9c519f5cf7e31d3c225e1d9a866f036beb850c7ddbe07ada6e6b7056684c64b2d grpc-1.21.3.tar.gz +sha512sums="7d9e126eafdfefe9b5c2eacf9c082b972115f231a55cff53386305f2df68037e2593eedc3f27fe0eaeb7fbe78b28f6b87607cdeccf59929b9a9b33bf74ab5c92 grpc-1.25.0.tar.gz dd55ab745c43c5c953d8cebd2fb44b4bb2cb87c95194965bffd0bd8219332d5f073c22947c8a8b1e2652805dff1cff4b93fe69645d4c0d635f98ae2cf54af14a googletest-ec44c6c1675c25b9827aacd08c02433cccde7780.tar.gz 7fa146ce86ddd4f160bb1ca9ff01cb7aca6b2b8c9aa50e4fa6b84504b9117b104be0d1e31ccb452d846549dfe1e9012ceccfcdc1f2357ed567621d71fb8b08c5 01-chttp2-maybe-uninitialized.patch -d50885978466137e595ccb8e45fc7e283ff18b61775c4e0d92c0f56310c719802e591816955d800e71aab1da36b52f938f32d46bed3c230dd2b1b08dca7f2a91 disable-Werror.patch f72be2359d89278cec96049833c7c94868f45f3670a6eb900921e0139514f160aac40408755b8fdc8c2e612678037027266d80025a12781253ad1293e24bdead fix-install.patch" diff --git a/community/grpc/disable-Werror.patch b/community/grpc/disable-Werror.patch deleted file mode 100644 index 13df26bed6..0000000000 --- a/community/grpc/disable-Werror.patch +++ /dev/null @@ -1,57 +0,0 @@ -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 - |