grpc: Update to 1.8.5
PATCH v2 1/1 grpc: Update to 1.8.5
Drop upstream patches which are not needed
update version in the patch to 1.8.5 as well
add a new patch to stop looking into native
sysroot for libcares
Signed-off-by Khem Raj <[email protected]>
---
Changes in v2:
- Drop upstreamed patches
- Fix cross build to not look into native sysroot for target libs
- Fix version in CMake file
...when-cross-compiling-the-host-grpc_cpp_pl.patch | 68 -------------
...ht-protoc-executable-regardless-of-protob.patch | 77 --------------
...txt-Fix-grpc_cpp_plugin-path-during-cross.patch | 0
....txt-Fix-libraries-installation-for-Linux.patch | 113 +++++++++++----------
...s.txt-Find-c-ares-in-target-sysroot-alone.patch | 42 ++++++++
.../grpc/{grpc_1.6.6.bb => grpc_1.8.5.bb} | 14 ++-
6 files changed, 109 insertions(+), 205 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch
delete mode 100644 meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-use-the-right-protoc-executable-regardless-of-protob.patch
rename meta-oe/recipes-devtools/grpc/{grpc-1.6.6 => grpc}/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch (100%)
rename meta-oe/recipes-devtools/grpc/{grpc-1.6.6 => grpc}/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch (60%)
create mode 100644 meta-oe/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch
rename meta-oe/recipes-devtools/grpc/{grpc_1.6.6.bb => grpc_1.8.5.bb} (71%)meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch deleted +0 -68
@@ -1,68 +0,0 @@ -From 43ae4e81056888623a73069c11da28a80c39a297 Mon Sep 17 00:00:00 2001 -From: Alexey Firago <[email protected]> -Date: Thu, 19 Oct 2017 00:20:36 +0300 -Subject: [PATCH] CMakeLists: when cross-compiling, the host grpc_cpp_plugin - should be used - -Signed-off-by: Alexey Firago <[email protected]> ---- - CMakeLists.txt | 9 ++++++++- - templates/CMakeLists.txt.template | 9 ++++++++- - 2 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2f66066..af2046c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -333,6 +333,13 @@ function(protobuf_generate_grpc_cpp) - get_filename_component(REL_DIR ${REL_FIL} DIRECTORY) - set(RELFIL_WE "${REL_DIR}/${FIL_WE}") - -+ #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() -+ - add_custom_command( - OUTPUT "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.cc" - "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.h" -@@ -342,7 +349,7 @@ function(protobuf_generate_grpc_cpp) - COMMAND ${_gRPC_PROTOBUF_PROTOC} - 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 850404b..09c1388 100644 ---- a/templates/CMakeLists.txt.template -+++ b/templates/CMakeLists.txt.template -@@ -378,6 +378,13 @@ - get_filename_component(REL_DIR <%text>${REL_FIL}</%text> DIRECTORY) - set(RELFIL_WE "<%text>${REL_DIR}/${FIL_WE}</%text>") - -+ #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() -+ - add_custom_command( - OUTPUT <%text>"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.cc"</%text> - <%text>"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.h"</%text> -@@ -387,7 +394,7 @@ - COMMAND <%text>$<TARGET_FILE:${_gRPC_PROTOBUF_PROTOC}></%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
meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-use-the-right-protoc-executable-regardless-of-protob.patch deleted +0 -77
77 lines not on this page · raw message
meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch renamed from meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch +0 -0
meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch renamed from meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch +61 -52
218 lines not on this page · raw message
meta-oe/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch new file +42 -0
42 lines not on this page · raw message
meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb renamed from meta-oe/recipes-devtools/grpc/grpc_1.6.6.bb +6 -8
@@ -10,14 +10,12 @@ DEPENDS_append_class-target = " gtest grpc-native " LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "https://github.com/grpc/grpc/archive/v1.6.6.tar.gz" -SRC_URI[md5sum] = "a960878ad0231189d48ac8ff17eeca3c" -SRC_URI[sha256sum] = "b97eaa0c8a63b0492dc94bdad621795b4815278e841f06b0c78d6bcbd4c8bdec" - -SRC_URI += " \ - file://0001-use-the-right-protoc-executable-regardless-of-protob.patch \ - file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \ -" +SRC_URI = "https://github.com/grpc/grpc/archive/v${PV}.tar.gz \ + file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \ + file://0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch \ + " +SRC_URI[md5sum] = "b565fa6787e42f4969395870c2ad436e" +SRC_URI[sha256sum] = "df9168da760fd2ee970c74c9d1b63377e0024be248deaa844e784d0df47599de" SRC_URI_append_class-target = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch"
Signature · 1 line
2.16.1
PATCH 1/1 sysdig: Use makefile generator instead of ninja for cmake
Fixes build errors e.g.
| ninja: error: build.ninja:205: bad $-escape (literal $ must be written as $$)
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-extended/sysdig/sysdig_git.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-oe/recipes-extended/sysdig/sysdig_git.bb +2 -0
@@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit cmake pkgconfig +OECMAKE_GENERATOR = "Unix Makefiles" + DEPENDS = "luajit zlib ncurses" RDEPENDS_${PN} = "bash"
Signature · 1 line
2.16.1