mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-17 04:37:19 +00:00
Code Issues Projects Releases Wiki Activity

grpc: Update to 1.8.5

Browse Source 
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 <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj
2018-02-01 23:47:25 -08:00
committed by Armin Kuster
parent 6cb84a77bb
commit 38f6ef9b14
6 changed files with 109 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch
-68
View File
@@ -1,68 +0,0 @@
From 43ae4e81056888623a73069c11da28a80c39a297 Mon Sep 17 00:00:00 2001
From: Alexey Firago <alexey_firago@mentor.com>
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 <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 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
-77
View File
@@ -1,77 +0,0 @@
From f640fcc81c76953b2e84fc3087f905141b6643b9 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Thu, 24 Aug 2017 17:51:47 +0200
Subject: [PATCH] use the right protoc executable regardless of protobuf
provider
---
CMakeLists.txt | 5 ++++-
templates/CMakeLists.txt.template | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bde8946..f9cd630 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,6 +190,7 @@ if("${gRPC_PROTOBUF_PROVIDER}" STREQUAL "module")
endif()
if(TARGET protoc)
set(_gRPC_PROTOBUF_PROTOC protoc)
+ set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE $<TARGET_FILE:protoc>)
endif()
else()
message(WARNING "gRPC_PROTOBUF_PROVIDER is \"module\" but PROTOBUF_ROOT_DIR is wrong")
@@ -213,8 +214,10 @@ elseif("${gRPC_PROTOBUF_PROVIDER}" STREQUAL "package")
endif()
if(TARGET protobuf::protoc)
set(_gRPC_PROTOBUF_PROTOC protobuf::protoc)
+ set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE $<TARGET_FILE:protobuf::protoc>)
else()
set(_gRPC_PROTOBUF_PROTOC ${PROTOBUF_PROTOC_EXECUTABLE})
+ set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE})
endif()
set(_gRPC_FIND_PROTOBUF "if(NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND)\n find_package(Protobuf ${gRPC_PROTOBUF_PACKAGE_TYPE})\nendif()")
endif()
@@ -339,7 +342,7 @@ function(protobuf_generate_grpc_cpp)
"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}_mock.grpc.pb.h"
"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc"
"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h"
- COMMAND $<TARGET_FILE:${_gRPC_PROTOBUF_PROTOC}>
+ 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>
diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template
index 850404b..64daf04 100644
--- a/templates/CMakeLists.txt.template
+++ b/templates/CMakeLists.txt.template
@@ -235,6 +235,7 @@
endif()
if(TARGET protoc)
set(_gRPC_PROTOBUF_PROTOC protoc)
+ set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE $<TARGET_FILE:protoc>)
endif()
else()
message(WARNING "gRPC_PROTOBUF_PROVIDER is \"module\" but PROTOBUF_ROOT_DIR is wrong")
@@ -258,8 +259,10 @@
endif()
if(TARGET protobuf::protoc)
set(_gRPC_PROTOBUF_PROTOC protobuf::protoc)
+ set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE $<TARGET_FILE:protobuf::protoc>)
else()
set(_gRPC_PROTOBUF_PROTOC <%text>${PROTOBUF_PROTOC_EXECUTABLE}</%text>)
+ set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE <%text>${PROTOBUF_PROTOC_EXECUTABLE}</%text>)
endif()
set(_gRPC_FIND_PROTOBUF "if(NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND)\n find_package(Protobuf <%text>${gRPC_PROTOBUF_PACKAGE_TYPE}</%text>)\nendif()")
endif()
@@ -384,7 +387,7 @@
<%text>"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}_mock.grpc.pb.h"</%text>
<%text>"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc"</%text>
<%text>"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h"</%text>
- COMMAND <%text>$<TARGET_FILE:${_gRPC_PROTOBUF_PROTOC}></%text>
+ 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>
--
2.7.4
meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch → meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
View File
meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch → meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
+61 -52
View File
@@ -1,157 +1,166 @@
From cc170860e5b77d7c9f3b9ce8730b719976dab2bb Mon Sep 17 00:00:00 2001 From 8e9bf962a45a82f1c2eb5858e29fa89a3a60b564 Mon Sep 17 00:00:00 2001
From: Alexey Firago <alexey_firago@mentor.com> From: Alexey Firago <alexey_firago@mentor.com>
Date: Mon, 30 Oct 2017 23:24:49 +0300 Date: Mon, 30 Oct 2017 23:24:49 +0300
Subject: [PATCH] CMakeLists.txt: Fix libraries installation for Linux Subject: [PATCH 1/4] CMakeLists.txt: Fix libraries installation for Linux
* Set libs versions as in Makefile * Set libs versions as in Makefile
Signed-off-by: Alexey Firago <alexey_firago@mentor.com> Signed-off-by: Alexey Firago <alexey_firago@mentor.com>
%% original patch: 0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
--- ---
CMakeLists.txt | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ CMakeLists.txt | 55 +++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+) CMakeLists.txt => CMakeLists.txt.orig | 0
2 files changed, 55 insertions(+)
copy CMakeLists.txt => CMakeLists.txt.orig (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9663934..5719435 100644 index b1a49df..13e64ac 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -30,6 +30,15 @@ set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") @@ -30,6 +30,15 @@ set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}")
set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/") set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")
project(${PACKAGE_NAME} C CXX) project(${PACKAGE_NAME} C CXX)
+set (CORE_VERSION_MAJOR "4") +set (CORE_VERSION_MAJOR "4")
+set (CORE_VERSION "4.0.0") +set (CORE_VERSION "4.0.0")
+ +
+set (CPP_VERSION_MAJOR "1") +set (CPP_VERSION_MAJOR "1")
+set (CPP_VERSION "1.6.6") +set (CPP_VERSION "${PACKAGE_VERSION}")
+ +
+set (CSHARP_VERSION_MAJOR "1") +set (CSHARP_VERSION_MAJOR "1")
+set (CSHARP_VERSION "1.6.6") +set (CSHARP_VERSION "${PACKAGE_VERSION}")
+ +
set(gRPC_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") set(gRPC_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
set(gRPC_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") set(gRPC_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
set(gRPC_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") set(gRPC_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
@@ -840,6 +849,10 @@ if(WIN32 AND MSVC) @@ -841,6 +850,10 @@ if(WIN32 AND MSVC)
endif() endif()
endif() endif()
+if(_gRPC_PLATFORM_LINUX) +if(_gRPC_PLATFORM_LINUX)
+ set_property(TARGET gpr PROPERTY VERSION ${CORE_VERSION}) + set_property(TARGET gpr PROPERTY VERSION ${CORE_VERSION})
+ set_property(TARGET gpr PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) + set_property(TARGET gpr PROPERTY SOVERSION ${CORE_VERSION_MAJOR})
+endif() +endif()
target_include_directories(gpr target_include_directories(gpr
PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -1228,6 +1241,10 @@ if(WIN32 AND MSVC) @@ -1221,6 +1234,10 @@ if(WIN32 AND MSVC)
endif() endif()
endif() endif()
+if(_gRPC_PLATFORM_LINUX) +if(_gRPC_PLATFORM_LINUX)
+ set_property(TARGET grpc PROPERTY VERSION ${CORE_VERSION}) + set_property(TARGET grpc PROPERTY VERSION ${CORE_VERSION})
+ set_property(TARGET grpc PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) + set_property(TARGET grpc PROPERTY SOVERSION ${CORE_VERSION_MAJOR})
+endif() +endif()
target_include_directories(grpc target_include_directories(grpc
PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -1534,6 +1551,10 @@ if(WIN32 AND MSVC) @@ -1535,6 +1552,10 @@ if(WIN32 AND MSVC)
endif() endif()
endif() endif()
+if(_gRPC_PLATFORM_LINUX) +if(_gRPC_PLATFORM_LINUX)
+ set_property(TARGET grpc_cronet PROPERTY VERSION ${CORE_VERSION}) + set_property(TARGET grpc_cronet PROPERTY VERSION ${CORE_VERSION})
+ set_property(TARGET grpc_cronet PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) + set_property(TARGET grpc_cronet PROPERTY SOVERSION ${CORE_VERSION_MAJOR})
+endif() +endif()
target_include_directories(grpc_cronet target_include_directories(grpc_cronet
PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -2366,6 +2387,10 @@ if(WIN32 AND MSVC) @@ -2377,6 +2398,10 @@ if(WIN32 AND MSVC)
endif() endif()
endif() endif()
+if(_gRPC_PLATFORM_LINUX) +if(_gRPC_PLATFORM_LINUX)
+ set_property(TARGET grpc_unsecure PROPERTY VERSION ${CORE_VERSION}) + set_property(TARGET grpc_unsecure PROPERTY VERSION ${CORE_VERSION})
+ set_property(TARGET grpc_unsecure PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) + set_property(TARGET grpc_unsecure PROPERTY SOVERSION ${CORE_VERSION_MAJOR})
+endif() +endif()
target_include_directories(grpc_unsecure target_include_directories(grpc_unsecure
PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -2583,6 +2608,10 @@ if(WIN32 AND MSVC) @@ -2592,6 +2617,10 @@ if(WIN32 AND MSVC)
endif() endif()
endif() endif()
+if(_gRPC_PLATFORM_LINUX) +if(_gRPC_PLATFORM_LINUX)
+ set_property(TARGET grpc++ PROPERTY VERSION ${CPP_VERSION}) + set_property(TARGET grpc++ PROPERTY VERSION ${CPP_VERSION})
+ set_property(TARGET grpc++ PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) + set_property(TARGET grpc++ PROPERTY SOVERSION ${CPP_VERSION_MAJOR})
+endif() +endif()
target_include_directories(grpc++ target_include_directories(grpc++
PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -3013,6 +3042,10 @@ if(WIN32 AND MSVC) @@ -3078,6 +3107,10 @@ if(WIN32 AND MSVC)
endif() endif()
endif() endif()
+if(_gRPC_PLATFORM_LINUX) +if(_gRPC_PLATFORM_LINUX)
+ set_property(TARGET grpc++_cronet PROPERTY VERSION ${CPP_VERSION}) + set_property(TARGET grpc++_cronet PROPERTY VERSION ${CPP_VERSION})
+ set_property(TARGET grpc++_cronet PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) + set_property(TARGET grpc++_cronet PROPERTY SOVERSION ${CPP_VERSION_MAJOR})
+endif() +endif()
target_include_directories(grpc++_cronet target_include_directories(grpc++_cronet
PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -3213,6 +3246,11 @@ protobuf_generate_grpc_cpp( @@ -3282,6 +3315,11 @@ protobuf_generate_grpc_cpp(
src/proto/grpc/status/status.proto src/proto/grpc/status/status.proto
) )
+if(_gRPC_PLATFORM_LINUX) +if(_gRPC_PLATFORM_LINUX)
+ set_property(TARGET grpc++_error_details PROPERTY VERSION ${CPP_VERSION}) + set_property(TARGET grpc++_error_details PROPERTY VERSION ${CPP_VERSION})
+ set_property(TARGET grpc++_error_details PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) + set_property(TARGET grpc++_error_details PROPERTY SOVERSION ${CPP_VERSION_MAJOR})
+endif() +endif()
+ +
target_include_directories(grpc++_error_details target_include_directories(grpc++_error_details
PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -3343,6 +3381,11 @@ protobuf_generate_grpc_cpp( @@ -3408,6 +3446,11 @@ protobuf_generate_grpc_cpp(
src/proto/grpc/reflection/v1alpha/reflection.proto src/proto/grpc/reflection/v1alpha/reflection.proto
) )
+if(_gRPC_PLATFORM_LINUX) +if(_gRPC_PLATFORM_LINUX)
+ set_property(TARGET grpc++_reflection PROPERTY VERSION ${CPP_VERSION}) + set_property(TARGET grpc++_reflection PROPERTY VERSION ${CPP_VERSION})
+ set_property(TARGET grpc++_reflection PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) + set_property(TARGET grpc++_reflection PROPERTY SOVERSION ${CPP_VERSION_MAJOR})
+endif() +endif()
+ +
target_include_directories(grpc++_reflection target_include_directories(grpc++_reflection
PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -3762,6 +3805,10 @@ if(WIN32 AND MSVC) @@ -3827,6 +3870,10 @@ if(WIN32 AND MSVC)
endif() endif()
endif() endif()
+if(_gRPC_PLATFORM_LINUX) +if(_gRPC_PLATFORM_LINUX)
+ set_property(TARGET grpc++_unsecure PROPERTY VERSION ${CPP_VERSION}) + set_property(TARGET grpc++_unsecure PROPERTY VERSION ${CPP_VERSION})
+ set_property(TARGET grpc++_unsecure PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) + set_property(TARGET grpc++_unsecure PROPERTY SOVERSION ${CPP_VERSION_MAJOR})
+endif() +endif()
target_include_directories(grpc++_unsecure target_include_directories(grpc++_unsecure
PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -4075,6 +4122,10 @@ if(WIN32 AND MSVC) @@ -4140,6 +4187,10 @@ if(WIN32 AND MSVC)
endif() endif()
endif() endif()
+if(_gRPC_PLATFORM_LINUX) +if(_gRPC_PLATFORM_LINUX)
+ set_property(TARGET grpc_plugin_support PROPERTY VERSION ${CORE_VERSION}) + set_property(TARGET grpc_plugin_support PROPERTY VERSION ${CORE_VERSION})
+ set_property(TARGET grpc_plugin_support PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) + set_property(TARGET grpc_plugin_support PROPERTY SOVERSION ${CORE_VERSION_MAJOR})
+endif() +endif()
target_include_directories(grpc_plugin_support target_include_directories(grpc_plugin_support
PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -4599,6 +4650,10 @@ if(WIN32 AND MSVC) @@ -4649,6 +4700,10 @@ if(WIN32 AND MSVC)
endif() endif()
endif() endif()
+if(_gRPC_PLATFORM_LINUX) +if(_gRPC_PLATFORM_LINUX)
+ set_property(TARGET grpc_csharp_ext PROPERTY VERSION ${CSHARP_VERSION}) + set_property(TARGET grpc_csharp_ext PROPERTY VERSION ${CSHARP_VERSION})
+ set_property(TARGET grpc_csharp_ext PROPERTY SOVERSION ${CSHARP_VERSION_MAJOR}) + set_property(TARGET grpc_csharp_ext PROPERTY SOVERSION ${CSHARP_VERSION_MAJOR})
+endif() +endif()
target_include_directories(grpc_csharp_ext target_include_directories(grpc_csharp_ext
PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-- diff --git a/CMakeLists.txt b/CMakeLists.txt.orig
2.7.4 similarity index 100%
copy from CMakeLists.txt
copy to CMakeLists.txt.orig
--
2.16.1
meta-oe/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch
+42
View File
@@ -0,0 +1,42 @@
From a498b56ba96948015f0f2784b2ab8296946716ee Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 1 Feb 2018 23:28:17 -0800
Subject: [PATCH 4/4] CMakeLists.txt: Find c-ares in target sysroot alone
Current code lets it look into native sysroot as well
which is then preferred during cross compile and it adds
absolute path to libcares into linker flags
on heterogenous architectures linker complains and build
fails
| /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/grpc/1.8.5-r0/recipe-sysroot-native/usr/lib/lib
cares.so.2.2.0: file not recognized: File format not recognized
| collect2: error: ld returned 1 exit status
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
CMakeLists.txt | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d7eef1..058423d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,10 +153,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "module")
set(gRPC_INSTALL FALSE)
endif()
elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package")
- find_package(c-ares REQUIRED CONFIG)
- if(TARGET c-ares::cares)
- set(_gRPC_CARES_LIBRARIES c-ares::cares)
- endif()
+ find_package(c-ares REQUIRED)
+ set(_gRPC_CARES_LIBRARIES cares)
set(_gRPC_FIND_CARES "if(NOT c-ares_FOUND)\n find_package(c-ares CONFIG)\nendif()")
endif()
--
2.16.1
meta-oe/recipes-devtools/grpc/grpc_1.6.6.bb → meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb
+6 -8
View File
@@ -10,14 +10,12 @@ DEPENDS_append_class-target = " gtest grpc-native "
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI = "https://github.com/grpc/grpc/archive/v1.6.6.tar.gz" SRC_URI = "https://github.com/grpc/grpc/archive/v${PV}.tar.gz \
SRC_URI[md5sum] = "a960878ad0231189d48ac8ff17eeca3c" file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \
SRC_URI[sha256sum] = "b97eaa0c8a63b0492dc94bdad621795b4815278e841f06b0c78d6bcbd4c8bdec" file://0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch \
"
SRC_URI += " \ SRC_URI[md5sum] = "b565fa6787e42f4969395870c2ad436e"
file://0001-use-the-right-protoc-executable-regardless-of-protob.patch \ SRC_URI[sha256sum] = "df9168da760fd2ee970c74c9d1b63377e0024be248deaa844e784d0df47599de"
file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \
"
SRC_URI_append_class-target = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch" SRC_URI_append_class-target = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch"