From 15dd238f7263f85aa36703482eb0de748a386a77 Mon Sep 17 00:00:00 2001 From: Clemens Gruber Date: Fri, 15 Feb 2019 15:42:01 +0100 Subject: grpc: version bump 1.17.2 -> 1.18.0 Signed-off-by: Clemens Gruber Signed-off-by: Michael Olbrich --- ...txt-allow-passing-a-pre-existing-grpc_cpp.patch | 48 ---------------------- .../grpc-1.17.2/0002-Add-pkg-config-files.patch | 47 --------------------- patches/grpc-1.17.2/series | 6 --- ...txt-allow-passing-a-pre-existing-grpc_cpp.patch | 48 ++++++++++++++++++++++ .../grpc-1.18.0/0002-Add-pkg-config-files.patch | 47 +++++++++++++++++++++ patches/grpc-1.18.0/series | 6 +++ rules/grpc.make | 4 +- 7 files changed, 103 insertions(+), 103 deletions(-) delete mode 100644 patches/grpc-1.17.2/0001-CMakeLists.txt-allow-passing-a-pre-existing-grpc_cpp.patch delete mode 100644 patches/grpc-1.17.2/0002-Add-pkg-config-files.patch delete mode 100644 patches/grpc-1.17.2/series create mode 100644 patches/grpc-1.18.0/0001-CMakeLists.txt-allow-passing-a-pre-existing-grpc_cpp.patch create mode 100644 patches/grpc-1.18.0/0002-Add-pkg-config-files.patch create mode 100644 patches/grpc-1.18.0/series diff --git a/patches/grpc-1.17.2/0001-CMakeLists.txt-allow-passing-a-pre-existing-grpc_cpp.patch b/patches/grpc-1.17.2/0001-CMakeLists.txt-allow-passing-a-pre-existing-grpc_cpp.patch deleted file mode 100644 index 82658fd27..000000000 --- a/patches/grpc-1.17.2/0001-CMakeLists.txt-allow-passing-a-pre-existing-grpc_cpp.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Robert Rose -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 ---- - 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.17.2/0002-Add-pkg-config-files.patch b/patches/grpc-1.17.2/0002-Add-pkg-config-files.patch deleted file mode 100644 index 713419bd9..000000000 --- a/patches/grpc-1.17.2/0002-Add-pkg-config-files.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Clemens Gruber -Date: Mon, 10 Dec 2018 13:44:53 +0100 -Subject: [PATCH] Add pkg-config files - ---- - grpc++.pc.in | 12 ++++++++++++ - grpc.pc.in | 12 ++++++++++++ - 2 files changed, 24 insertions(+) - create mode 100644 grpc++.pc.in - create mode 100644 grpc.pc.in - -diff --git a/grpc++.pc.in b/grpc++.pc.in -new file mode 100644 -index 000000000000..c2677831a9c7 ---- /dev/null -+++ b/grpc++.pc.in -@@ -0,0 +1,12 @@ -+prefix=${pcfiledir}/../.. -+exec_prefix=${prefix} -+libdir=${prefix}/lib -+includedir=${prefix}/include -+ -+Name: gRPC++ -+Description: C++ wrapper for gRPC -+Version: @VERSION@ -+Cflags: -I${includedir} -+Requires.private: grpc protobuf -+Libs: -L${libdir} -lgrpc++ -+Libs.private: -diff --git a/grpc.pc.in b/grpc.pc.in -new file mode 100644 -index 000000000000..917c57a5e074 ---- /dev/null -+++ b/grpc.pc.in -@@ -0,0 +1,12 @@ -+prefix=${pcfiledir}/../.. -+exec_prefix=${prefix} -+libdir=${prefix}/lib -+includedir=${prefix}/include -+ -+Name: gRPC -+Description: high performance general RPC framework -+Version: @VERSION@ -+Cflags: -I${includedir} -+Requires.private: zlib libcares openssl -+Libs: -L{libdir} -lgrpc -+Libs.private: -lgpr diff --git a/patches/grpc-1.17.2/series b/patches/grpc-1.17.2/series deleted file mode 100644 index fa19512af..000000000 --- a/patches/grpc-1.17.2/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/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 new file mode 100644 index 000000000..82658fd27 --- /dev/null +++ b/patches/grpc-1.18.0/0001-CMakeLists.txt-allow-passing-a-pre-existing-grpc_cpp.patch @@ -0,0 +1,48 @@ +From: Robert Rose +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 +--- + 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/0002-Add-pkg-config-files.patch b/patches/grpc-1.18.0/0002-Add-pkg-config-files.patch new file mode 100644 index 000000000..713419bd9 --- /dev/null +++ b/patches/grpc-1.18.0/0002-Add-pkg-config-files.patch @@ -0,0 +1,47 @@ +From: Clemens Gruber +Date: Mon, 10 Dec 2018 13:44:53 +0100 +Subject: [PATCH] Add pkg-config files + +--- + grpc++.pc.in | 12 ++++++++++++ + grpc.pc.in | 12 ++++++++++++ + 2 files changed, 24 insertions(+) + create mode 100644 grpc++.pc.in + create mode 100644 grpc.pc.in + +diff --git a/grpc++.pc.in b/grpc++.pc.in +new file mode 100644 +index 000000000000..c2677831a9c7 +--- /dev/null ++++ b/grpc++.pc.in +@@ -0,0 +1,12 @@ ++prefix=${pcfiledir}/../.. ++exec_prefix=${prefix} ++libdir=${prefix}/lib ++includedir=${prefix}/include ++ ++Name: gRPC++ ++Description: C++ wrapper for gRPC ++Version: @VERSION@ ++Cflags: -I${includedir} ++Requires.private: grpc protobuf ++Libs: -L${libdir} -lgrpc++ ++Libs.private: +diff --git a/grpc.pc.in b/grpc.pc.in +new file mode 100644 +index 000000000000..917c57a5e074 +--- /dev/null ++++ b/grpc.pc.in +@@ -0,0 +1,12 @@ ++prefix=${pcfiledir}/../.. ++exec_prefix=${prefix} ++libdir=${prefix}/lib ++includedir=${prefix}/include ++ ++Name: gRPC ++Description: high performance general RPC framework ++Version: @VERSION@ ++Cflags: -I${includedir} ++Requires.private: zlib libcares openssl ++Libs: -L{libdir} -lgrpc ++Libs.private: -lgpr diff --git a/patches/grpc-1.18.0/series b/patches/grpc-1.18.0/series new file mode 100644 index 000000000..fa19512af --- /dev/null +++ b/patches/grpc-1.18.0/series @@ -0,0 +1,6 @@ +# 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/rules/grpc.make b/rules/grpc.make index 78933eb5d..18aaff0cd 100644 --- a/rules/grpc.make +++ b/rules/grpc.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GRPC) += grpc # # Paths and names # -GRPC_VERSION := 1.17.2 -GRPC_MD5 := 346ecc9a9162664f7f50aadcdb4eac8e +GRPC_VERSION := 1.18.0 +GRPC_MD5 := 520c545189fad05966c147c42e8280cc GRPC := grpc-$(GRPC_VERSION) GRPC_SUFFIX := tar.gz GRPC_URL := https://github.com/grpc/grpc/archive/v$(GRPC_VERSION).$(GRPC_SUFFIX) -- cgit v1.2.3