diff options
Diffstat (limited to 'meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch')
-rw-r--r-- | meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch | 107 |
1 files changed, 0 insertions, 107 deletions
diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch deleted file mode 100644 index d9cfa009f9..0000000000 --- a/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch +++ /dev/null @@ -1,107 +0,0 @@ -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 |