[ptxdist] [PATCH 2/3] grpc: version bump 1.18.0 -> 1.21.0

[Clemens Gruber <clemens.gruber@pqgruber.com>]

One of the two patches is no longer necessary.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 ...llow-passing-a-pre-existing-grpc_cpp.patch | 48 -------------------
 patches/grpc-1.18.0/series                    |  6 ---
 .../0001-Add-pkg-config-files.patch}          |  0
 patches/grpc-1.21.0/series                    |  5 ++
 rules/grpc.make                               |  7 +--
 rules/host-grpc.make                          |  2 +
 6 files changed, 11 insertions(+), 57 deletions(-)
 delete mode 100644 patches/grpc-1.18.0/0001-CMakeLists.txt-allow-passing-a-pre-existing-grpc_cpp.patch
 delete mode 100644 patches/grpc-1.18.0/series
 rename patches/{grpc-1.18.0/0002-Add-pkg-config-files.patch => grpc-1.21.0/0001-Add-pkg-config-files.patch} (100%)
 create mode 100644 patches/grpc-1.21.0/series

diff --git a/patches/grpc-1.18.0/0001-CMakeLists.txt-allow-passing-a-pre-existing-grpc_cpp.patch b/patches/grpc-1.18.0/0001-CMakeLists.txt-allow-passing-a-pre-existing-grpc_cpp.patch
deleted file mode 100644
index 82658fd27..000000000
--- a/patches/grpc-1.18.0/0001-CMakeLists.txt-allow-passing-a-pre-existing-grpc_cpp.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Robert Rose <robertroyrose@gmail.com>
-Date: Wed, 28 Nov 2018 09:41:52 -0800
-Subject: [PATCH] CMakeLists.txt: allow passing a pre-existing grpc_cpp_plugin
-
-The grpc_cpp_plugin is meant to be executed during the build process
-of grpc. As such, in cross-compilation contexts, this program needs to
-be built for the host machine and not the target machine. In order to
-allow this, this commit adds an option gRPC_NATIVE_CPP_PLUGIN that can
-be passed on the command line, with the path to an existing
-grpc_cpp_plugin binary. If not passed, grpc_cpp_plugin is built as
-usual.
-
-Signed-off-by: Robert Rose <robertroyrose@gmail.com>
----
- CMakeLists.txt | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b39e6f8e8852..9d9be187bda7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13228,6 +13228,18 @@ target_link_libraries(grpc_cli
- endif (gRPC_BUILD_TESTS)
- if (gRPC_BUILD_CODEGEN)
- 
-+if (gRPC_NATIVE_CPP_PLUGIN)
-+
-+add_executable(grpc_cpp_plugin
-+  IMPORTED
-+)
-+
-+set_property(TARGET grpc_cpp_plugin
-+  PROPERTY IMPORTED_LOCATION ${gRPC_NATIVE_CPP_PLUGIN}
-+)
-+
-+else()
-+
- add_executable(grpc_cpp_plugin
-   src/compiler/cpp_plugin.cc
- )
-@@ -13263,6 +13275,7 @@ if (gRPC_INSTALL)
-     ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
-   )
- endif()
-+endif()
- 
- endif (gRPC_BUILD_CODEGEN)
- if (gRPC_BUILD_CODEGEN)
diff --git a/patches/grpc-1.18.0/series b/patches/grpc-1.18.0/series
deleted file mode 100644
index fa19512af..000000000
--- a/patches/grpc-1.18.0/series
+++ /dev/null
@@ -1,6 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-CMakeLists.txt-allow-passing-a-pre-existing-grpc_cpp.patch
-0002-Add-pkg-config-files.patch
-#tag:upstream --start-number 100
-# 61bf82594774e0a1ed5c10c258776dcf  - git-ptx-patches magic
diff --git a/patches/grpc-1.18.0/0002-Add-pkg-config-files.patch b/patches/grpc-1.21.0/0001-Add-pkg-config-files.patch
similarity index 100%
rename from patches/grpc-1.18.0/0002-Add-pkg-config-files.patch
rename to patches/grpc-1.21.0/0001-Add-pkg-config-files.patch
diff --git a/patches/grpc-1.21.0/series b/patches/grpc-1.21.0/series
new file mode 100644
index 000000000..f855d43a1
--- /dev/null
+++ b/patches/grpc-1.21.0/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Add-pkg-config-files.patch
+#tag:upstream --start-number 100
+# bb88160543076859dd8fb26f54d571b1  - git-ptx-patches magic
diff --git a/rules/grpc.make b/rules/grpc.make
index 18aaff0cd..0f662b582 100644
--- a/rules/grpc.make
+++ b/rules/grpc.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GRPC) += grpc
 #
 # Paths and names
 #
-GRPC_VERSION	:= 1.18.0
-GRPC_MD5	:= 520c545189fad05966c147c42e8280cc
+GRPC_VERSION	:= 1.21.0
+GRPC_MD5	:= 9203f75a9a118684d2dd23500eabd2dd
 GRPC		:= grpc-$(GRPC_VERSION)
 GRPC_SUFFIX	:= tar.gz
 GRPC_URL	:= https://github.com/grpc/grpc/archive/v$(GRPC_VERSION).$(GRPC_SUFFIX)
@@ -39,14 +39,15 @@ GRPC_CONF_OPT	:= \
 	-DBUILD_SHARED_LIBS=ON \
 	-DCMAKE_CXX_FLAGS='-Wno-error=ignored-qualifiers' \
 	-DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF \
+	-DgRPC_BENCHMARK_PROVIDER=none \
 	-DgRPC_BUILD_CSHARP_EXT=OFF \
 	-DgRPC_BUILD_TESTS=OFF \
 	-D_gRPC_CARES_LIBRARIES=cares \
 	-DgRPC_CARES_PROVIDER=none \
+	-DgRPC_GFLAGS_PROVIDER=none \
 	-DgRPC_PROTOBUF_PROVIDER=package \
 	-DgRPC_SSL_PROVIDER=package \
 	-DgRPC_ZLIB_PROVIDER=package \
-	-DgRPC_NATIVE_CPP_PLUGIN=$(PTXDIST_SYSROOT_HOST)/bin/grpc_cpp_plugin \
 	-DPROTOBUF_PROTOC_EXECUTABLE=$(PTXDIST_SYSROOT_HOST)/bin/protoc
 
 # ----------------------------------------------------------------------------
diff --git a/rules/host-grpc.make b/rules/host-grpc.make
index 7d7ad9f69..5efa354f6 100644
--- a/rules/host-grpc.make
+++ b/rules/host-grpc.make
@@ -26,10 +26,12 @@ HOST_GRPC_CONF_OPT	:= \
 	$(HOST_CMAKE_OPT) \
 	-DCMAKE_CXX_FLAGS='-Wno-error=ignored-qualifiers' \
 	-DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF \
+	-DgRPC_BENCHMARK_PROVIDER=none \
 	-DgRPC_BUILD_CSHARP_EXT=OFF \
 	-DgRPC_BUILD_TESTS=OFF \
 	-D_gRPC_CARES_LIBRARIES=cares \
 	-DgRPC_CARES_PROVIDER=none \
+	-DgRPC_GFLAGS_PROVIDER=none \
 	-DgRPC_PROTOBUF_PROVIDER=package \
 	-DgRPC_SSL_PROVIDER=package \
 	-DgRPC_ZLIB_PROVIDER=package
-- 
2.21.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de