[oe-commits] [meta-openembedded] 05/05: grpc: Define libdir and cmakedir in terms of multilib

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 11cf50040ab388f004fb3d2ed2901138455bf027
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Sat Dec 14 21:04:06 2019 -0800

    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 at gmail.com>
---
 meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb b/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb
index 24072c0..3cde6f7 100644
--- a/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb
+++ b/meta-networking/recipes-devtools/grpc/grpc_1.24.3.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() {
@@ -48,6 +50,6 @@ do_configure_prepend_toolchain-clang_x86() {
 
 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}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.