diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-09-07 18:58:51 +0000 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-10-01 13:14:20 -0400 |
commit | 757e94a3dfd7ec792c01e3ecee295ea987955f5a (patch) | |
tree | 72fd9de1db26f666b0138c39fa150d8b8b0e8f07 /meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch | |
parent | 4a2471930c63da38cbea2270a313f1610274f7ba (diff) | |
download | talos-openbmc-757e94a3dfd7ec792c01e3ecee295ea987955f5a.tar.gz talos-openbmc-757e94a3dfd7ec792c01e3ecee295ea987955f5a.zip |
meta-openembedded: sumo refresh be79b8b111..2bb21ef27c
Update meta-openembedded to sumo HEAD.
Armin Kuster (1):
grpc: move it from oe to networking layer
Khem Raj (2):
gedit: Add dep on python-six-native
poppler: Update to 0.64
Martin Jansa (2):
libqb: Fix build with gold
openocd: prevent fetching git submodules during do_configure
Nicolas Dechesne (1):
meta-multimedia: fixup LAYERDEPENDS
Paul Eggleton (1):
protobuf: make python-protobuf dependency optional and default to off
Sinan Kaya (1):
dnsmasq: CVE-2017-15107
Takuro Ashie (1):
uim: Fix SRC_URI
Change-Id: I611fc4019b8a7fcbcaf2bcca40d7e35a650e5120
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch deleted file mode 100644 index 5774e62eb..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch +++ /dev/null @@ -1,68 +0,0 @@ -From cc6dbabea0e452ebc93682df860a79ed9a45722e Mon Sep 17 00:00:00 2001 -From: Alexey Firago <alexey_firago@mentor.com> -Date: Fri, 20 Oct 2017 00:04:19 +0300 -Subject: [PATCH] CMakeLists.txt: Fix grpc_cpp_plugin path during - cross-compilation - -Signed-off-by: Alexey Firago <alexey_firago@mentor.com> ---- - CMakeLists.txt | 9 ++++++++- - templates/CMakeLists.txt.template | 9 ++++++++- - 2 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9cd630..9663934 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -328,6 +328,13 @@ function(protobuf_generate_grpc_cpp) - return() - endif() - -+ #if cross-compiling, find host plugin -+ if(CMAKE_CROSSCOMPILING) -+ find_program(gRPC_CPP_PLUGIN grpc_cpp_plugin) -+ else() -+ set(gRPC_CPP_PLUGIN $<TARGET_FILE:grpc_cpp_plugin>) -+ endif() -+ - set(_protobuf_include_path -I . -I ${PROTOBUF_WELLKNOWN_IMPORT_DIR}) - foreach(FIL ${ARGN}) - get_filename_component(ABS_FIL ${FIL} ABSOLUTE) -@@ -345,7 +352,7 @@ function(protobuf_generate_grpc_cpp) - COMMAND ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE} - ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR} - --cpp_out=${_gRPC_PROTO_GENS_DIR} -- --plugin=protoc-gen-grpc=$<TARGET_FILE:grpc_cpp_plugin> -+ --plugin=protoc-gen-grpc=${gRPC_CPP_PLUGIN} - ${_protobuf_include_path} - ${REL_FIL} - DEPENDS ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} grpc_cpp_plugin -diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template -index 64daf04..a7e8629 100644 ---- a/templates/CMakeLists.txt.template -+++ b/templates/CMakeLists.txt.template -@@ -373,6 +373,13 @@ - return() - endif() - -+ #if cross-compiling, find host plugin -+ if(CMAKE_CROSSCOMPILING) -+ find_program(gRPC_CPP_PLUGIN grpc_cpp_plugin) -+ else() -+ set(gRPC_CPP_PLUGIN $<TARGET_FILE:grpc_cpp_plugin>) -+ endif() -+ - set(_protobuf_include_path -I . -I <%text>${PROTOBUF_WELLKNOWN_IMPORT_DIR}</%text>) - foreach(FIL <%text>${ARGN}</%text>) - get_filename_component(ABS_FIL <%text>${FIL}</%text> ABSOLUTE) -@@ -390,7 +397,7 @@ - COMMAND <%text>${_gRPC_PROTOBUF_PROTOC_EXECUTABLE}</%text> - ARGS --grpc_out=<%text>generate_mock_code=true:${_gRPC_PROTO_GENS_DIR}</%text> - --cpp_out=<%text>${_gRPC_PROTO_GENS_DIR}</%text> -- --plugin=protoc-gen-grpc=$<TARGET_FILE:grpc_cpp_plugin> -+ --plugin=protoc-gen-grpc=${gRPC_CPP_PLUGIN} - <%text>${_protobuf_include_path}</%text> - <%text>${REL_FIL}</%text> - DEPENDS <%text>${ABS_FIL}</%text> <%text>${_gRPC_PROTOBUF_PROTOC}</%text> grpc_cpp_plugin --- -2.7.4 |