aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-12-14 21:04:06 -0800
committerArmin Kuster <akuster808@gmail.com>2020-01-05 14:43:51 -0800
commitc61c89918e3774926fd0e56fb40262e4cca0a7be (patch)
tree2d572a979f690ae0f863f979dd51d577e72583f0
parentb867bb9efdd7ae1184abde0954dacb438610424a (diff)
downloadmeta-openembedded-contrib-c61c89918e3774926fd0e56fb40262e4cca0a7be.tar.gz
meta-openembedded-contrib-c61c89918e3774926fd0e56fb40262e4cca0a7be.tar.bz2
meta-openembedded-contrib-c61c89918e3774926fd0e56fb40262e4cca0a7be.zip
grpc: Define libdir and cmakedir in terms of multilib
This helps in avoiding packaging errors seen with distros enabling multilib Fixes ERROR: grpc-1.24.3-r0 do_package: QA Issue: grpc: Files/directories were installed but not shipped in any package: /usr/lib/libgrpc++.so.1.24.3 ... /usr/lib/cmake /usr/lib/cmake/grpc /usr/lib/cmake/grpc/gRPCConfigVersion.cmake /usr/lib/cmake/grpc/gRPCConfig.cmake /usr/lib/cmake/grpc/gRPCTargets-noconfig.cmake /usr/lib/cmake/grpc/gRPCTargets.cmake Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or de lete them within do_install. Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit e18d8c957034908f27350e6ffcae2a3d05a4387b) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb b/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb
index 5cfa3aa82e..8d54dbeff8 100644
--- a/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb
+++ b/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb
@@ -36,6 +36,8 @@ EXTRA_OECMAKE = " \
-DgRPC_INSTALL=ON \
-DCMAKE_CROSSCOMPILING=ON \
-DBUILD_SHARED_LIBS=ON \
+ -DgRPC_INSTALL_LIBDIR=${baselib} \
+ -DgRPC_INSTALL_CMAKEDIR=${baselib}/cmake/${BPN} \
"
do_configure_prepend_mipsarch() {
@@ -44,6 +46,6 @@ do_configure_prepend_mipsarch() {
BBCLASSEXTEND = "native nativesdk"
-SYSROOT_DIRS_BLACKLIST_append_class-target = "${libdir}/cmake/grpc"
+SYSROOT_DIRS_BLACKLIST_append_class-target = "${baselib}/cmake/grpc"
FILES_${PN}-dev += "${bindir}"