mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 22:35:25 +01:00
grpc: upgrade 1.38.1 -> 1.41.0
Drop the patch that fixes cross compilation, because it's already in 1.41.0. Add the patch for regression fix [1], which should be dropped on the recipe upgrade. [1] https://github.com/grpc/grpc/issues/26857 Signed-off-by: Vyacheslav Yurkov <uvv.mail@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Vyacheslav Yurkov
Khem Raj
parent
24514e48b2
commit
c5e89108ee
|
|
@ -0,0 +1,107 @@
|
|||
From 50d54458324c1a19eefb9968e4cb556dbd34b875 Mon Sep 17 00:00:00 2001
|
||||
From: Vyacheslav Yurkov <uvv.mail@gmail.com>
|
||||
Date: Tue, 12 Oct 2021 19:11:40 +0200
|
||||
Subject: [PATCH] cmake: revert db88fb0ee826e73323e06ac6166ac038ee71f6a
|
||||
(#27626)
|
||||
|
||||
Fix regression introduced by previous commit. Original problem that
|
||||
commit was trying to fix was solved by modification of grpc recipe in
|
||||
meta-openembedded project repository
|
||||
|
||||
Fixes #26857
|
||||
|
||||
Signed-off-by: Vyacheslav Yurkov <uvv.mail@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 16 ++++++++--------
|
||||
templates/CMakeLists.txt.template | 2 --
|
||||
2 files changed, 8 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0e8fbdee8b..02cd48bee4 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -3828,7 +3828,7 @@ foreach(_hdr
|
||||
endforeach()
|
||||
|
||||
|
||||
-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
|
||||
+if(gRPC_INSTALL)
|
||||
install(TARGETS grpc_plugin_support EXPORT gRPCTargets
|
||||
RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
|
||||
LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
|
||||
@@ -11679,7 +11679,7 @@ target_link_libraries(grpc_cpp_plugin
|
||||
|
||||
|
||||
|
||||
-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
|
||||
+if(gRPC_INSTALL)
|
||||
install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets
|
||||
RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
|
||||
LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
|
||||
@@ -11718,7 +11718,7 @@ target_link_libraries(grpc_csharp_plugin
|
||||
|
||||
|
||||
|
||||
-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
|
||||
+if(gRPC_INSTALL)
|
||||
install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets
|
||||
RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
|
||||
LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
|
||||
@@ -11757,7 +11757,7 @@ target_link_libraries(grpc_node_plugin
|
||||
|
||||
|
||||
|
||||
-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
|
||||
+if(gRPC_INSTALL)
|
||||
install(TARGETS grpc_node_plugin EXPORT gRPCTargets
|
||||
RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
|
||||
LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
|
||||
@@ -11796,7 +11796,7 @@ target_link_libraries(grpc_objective_c_plugin
|
||||
|
||||
|
||||
|
||||
-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
|
||||
+if(gRPC_INSTALL)
|
||||
install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets
|
||||
RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
|
||||
LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
|
||||
@@ -11835,7 +11835,7 @@ target_link_libraries(grpc_php_plugin
|
||||
|
||||
|
||||
|
||||
-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
|
||||
+if(gRPC_INSTALL)
|
||||
install(TARGETS grpc_php_plugin EXPORT gRPCTargets
|
||||
RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
|
||||
LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
|
||||
@@ -11874,7 +11874,7 @@ target_link_libraries(grpc_python_plugin
|
||||
|
||||
|
||||
|
||||
-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
|
||||
+if(gRPC_INSTALL)
|
||||
install(TARGETS grpc_python_plugin EXPORT gRPCTargets
|
||||
RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
|
||||
LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
|
||||
@@ -11913,7 +11913,7 @@ target_link_libraries(grpc_ruby_plugin
|
||||
|
||||
|
||||
|
||||
-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
|
||||
+if(gRPC_INSTALL)
|
||||
install(TARGETS grpc_ruby_plugin EXPORT gRPCTargets
|
||||
RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
|
||||
LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
|
||||
diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template
|
||||
index 0f0883e09c..b9a5bc4144 100644
|
||||
--- a/templates/CMakeLists.txt.template
|
||||
+++ b/templates/CMakeLists.txt.template
|
||||
@@ -695,8 +695,6 @@
|
||||
# grpcpp_channelz doesn't build with protobuf-lite, so no install required
|
||||
# See https://github.com/grpc/grpc/issues/22826
|
||||
if(gRPC_INSTALL AND NOT gRPC_USE_PROTO_LITE)
|
||||
- % elif tgt.build == 'protoc':
|
||||
- if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
|
||||
% else:
|
||||
if(gRPC_INSTALL)
|
||||
% endif
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
From 83a66aa45d63d79cbccc47a65998723a7d2d7637 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
|
||||
Date: Wed, 23 Jun 2021 14:22:59 +0200
|
||||
Subject: [PATCH] cmake: fix cross-compilation with
|
||||
gRPC_BUILD_GRPC_CPP_PLUGIN=OFF (#26292)
|
||||
|
||||
* cmake: fix cross-compilation with gRPC_BUILD_GRPC_CPP_PLUGIN=OFF
|
||||
|
||||
When cross-compiling gRPC, a _native_ version of 'grpc_cpp_plugin' is
|
||||
searched in the environment. For most use cases, a _cross_ version of this
|
||||
file is not needed and gRPC_BUILD_GRPC_CPP_PLUGIN can be set to OFF.
|
||||
|
||||
However, when cross-building with -DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF, there
|
||||
are some build errors, for example:
|
||||
|
||||
make[3]: *** No rule to make target 'grpc_cpp_plugin', needed by 'gens/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc'. Stop.
|
||||
|
||||
This is because there is still a hard dependency on 'grpc_cpp_plugin' for
|
||||
these targets, not taking into account the cross-compilation case.
|
||||
|
||||
Fix by depending on the variable gRPC_CPP_PLUGIN, which is set correctly for
|
||||
either cross or native case.
|
||||
|
||||
* regenerate projects
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
templates/CMakeLists.txt.template | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index eeaf0b43c7..c60a64917a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -319,7 +319,7 @@ function(protobuf_generate_grpc_cpp)
|
||||
--plugin=protoc-gen-grpc=${_gRPC_CPP_PLUGIN}
|
||||
${_protobuf_include_path}
|
||||
${REL_FIL}
|
||||
- DEPENDS ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} grpc_cpp_plugin
|
||||
+ DEPENDS ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} ${_gRPC_CPP_PLUGIN}
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
COMMENT "Running gRPC C++ protocol buffer compiler on ${FIL}"
|
||||
VERBATIM)
|
||||
diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template
|
||||
index cef2534cbd..f0afe5108e 100644
|
||||
--- a/templates/CMakeLists.txt.template
|
||||
+++ b/templates/CMakeLists.txt.template
|
||||
@@ -389,7 +389,7 @@
|
||||
--plugin=protoc-gen-grpc=<%text>${_gRPC_CPP_PLUGIN}</%text>
|
||||
<%text>${_protobuf_include_path}</%text>
|
||||
<%text>${REL_FIL}</%text>
|
||||
- DEPENDS <%text>${ABS_FIL}</%text> <%text>${_gRPC_PROTOBUF_PROTOC}</%text> grpc_cpp_plugin
|
||||
+ DEPENDS <%text>${ABS_FIL}</%text> <%text>${_gRPC_PROTOBUF_PROTOC}</%text> <%text>${_gRPC_CPP_PLUGIN}</%text>
|
||||
WORKING_DIRECTORY <%text>${CMAKE_CURRENT_SOURCE_DIR}</%text>
|
||||
COMMENT "Running gRPC C++ protocol buffer compiler on <%text>${FIL}</%text>"
|
||||
VERBATIM)
|
||||
|
|
@ -20,10 +20,10 @@ RDEPENDS:${PN}-dev:class_native += "${PN}-compiler"
|
|||
# RDEPENDS:${PN}-dev += "${PN}-compiler"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
SRCREV_grpc = "96b73272eadc01afb5fb45b92b408c47e4387274"
|
||||
BRANCH = "v1.38.x"
|
||||
SRCREV_grpc = "fc662b7964384b701af5bd3ce6994d2180080eb4"
|
||||
BRANCH = "v1.41.x"
|
||||
SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \
|
||||
file://0002-cmake-fix-cross-compilation-with-gRPC_BUILD_GRPC_CPP.patch \
|
||||
file://0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch \
|
||||
"
|
||||
# Fixes build with older compilers 4.8 especially on ubuntu 14.04
|
||||
CXXFLAGS:append:class-native = " -Wl,--no-as-needed"
|
||||
Loading…
Reference in New Issue
Block a user