mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-10-01 06:21:56 -09:00
package/grpc: remove obsolete patch to support cross-compiling
When cross-compiling grpc, a native tool 'grpc_cpp_plugin' is needed.
Patch '0001-target-build-using-host-plugin.patch' in Buildroot provides a
way to pass the path to this tool via a configure option
'gRPC_NATIVE_CPP_PLUGIN'.
In version 1.20.0, the upstream grpc project added better support for
cross-compiling via commit 0d7a0ded [1], searching for the native
grpc_cpp_plugin via PATH (rather than specifying it as configure option as
our patch was doing).
This change renders the mentioned Buildroot patch obsolete, so remove it.
[1] 0d7a0ded1c
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Reviewed-by: Michael Nosthoff <buildroot@heine.tech>
Tested-by: Michael Nosthoff <buildroot@heine.tech>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
committed by
Peter Korsgaard
parent
8f8c11fbb2
commit
fedf3318e3
@@ -1,52 +0,0 @@
|
|||||||
From aa18148e392ef28275a182db34397ccb66fb4617 Mon Sep 17 00:00:00 2001
|
|
||||||
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 be695c2..45c2fcb 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -11199,6 +11199,18 @@ target_link_libraries(grpc_cli
|
|
||||||
endif()
|
|
||||||
if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_CPP_PLUGIN)
|
|
||||||
|
|
||||||
+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
|
|
||||||
)
|
|
||||||
@@ -11233,6 +11245,7 @@ if(gRPC_INSTALL)
|
|
||||||
ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
+endif()
|
|
||||||
|
|
||||||
endif()
|
|
||||||
if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_CSHARP_PLUGIN)
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
||||||
@@ -27,8 +27,7 @@ GRPC_CONF_OPTS = \
|
|||||||
-DgRPC_PROTOBUF_PROVIDER=package \
|
-DgRPC_PROTOBUF_PROVIDER=package \
|
||||||
-DgRPC_RE2_PROVIDER=package \
|
-DgRPC_RE2_PROVIDER=package \
|
||||||
-DgRPC_SSL_PROVIDER=package \
|
-DgRPC_SSL_PROVIDER=package \
|
||||||
-DgRPC_ZLIB_PROVIDER=package \
|
-DgRPC_ZLIB_PROVIDER=package
|
||||||
-DgRPC_NATIVE_CPP_PLUGIN=$(HOST_DIR)/bin/grpc_cpp_plugin
|
|
||||||
|
|
||||||
# grpc can use __atomic builtins, so we need to link with
|
# grpc can use __atomic builtins, so we need to link with
|
||||||
# libatomic when available
|
# libatomic when available
|
||||||
|
|||||||
Reference in New Issue
Block a user