diff options
author | Scott Murray <scott.murray@konsulko.com> | 2022-05-25 15:45:40 -0400 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2022-05-26 11:27:50 -0400 |
commit | 9d336d94a35b124e59c83b0ea08f93f1a51bb165 (patch) | |
tree | 83ae6ba0a5bf4acf6829b6246105ab7853c88d91 /recipes-devtools/grpc/grpc_agldemo.inc | |
parent | d6b2260cb2114668d025d80068855a615e785d3b (diff) |
grpc: fix installed CMake package
The CMake package configuration installed by grpc ends up not being
usable in practice. Add a bbappend that adds the fixes:
- a do_install:append to correct the version number to the actual
version, as it gets mangled somehow during the grpc build. This
is required to avoid triggering version mismatch checks when using
the package in CMake.
- backport a fix from the kirkstone branch of meta-openembedded that
splits the host tools (i.e. protoc plugins) out into a separate
CMake package. This avoids failures due to CMake not playing well
with the split native versus target sysroots that OpenEmbedded
uses. This may be revisited if grpc upstream comes up with a
different approach.
Bug-AGL: SPEC-4405
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ia284901c148c1fcdf1b8ab77947d8be9445be631
Diffstat (limited to 'recipes-devtools/grpc/grpc_agldemo.inc')
-rw-r--r-- | recipes-devtools/grpc/grpc_agldemo.inc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/recipes-devtools/grpc/grpc_agldemo.inc b/recipes-devtools/grpc/grpc_agldemo.inc new file mode 100644 index 000000000..73ab083dd --- /dev/null +++ b/recipes-devtools/grpc/grpc_agldemo.inc @@ -0,0 +1,12 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +SRC_URI += "file://0001-cmake-add-separate-export-for-plugin-targets.patch" + +do_install:append() { + # The gRPC package version seems to get clobbered in its CMake + # package (seemingly with the c-ares version), but the root cause + # is not obvious and the issue is not present with newer versions + # of things in kirkstone. So for now just fix the version to + # avoid mismatch errors. + sed -i "s/^set(PACKAGE_VERSION \"1\.16\.1\")$/set(PACKAGE_VERSION \"${PV}\")/" ${D}/${libdir}/cmake/${BPN}/gRPCConfigVersion.cmake +} |