From: Nitin A Kamble <nitin.a.kamble@intel.com>
Date: Mon, 12 Mar 2012 16:28:10 +0000 (-0700)
Subject: cmake.bbclass: add ${base_libdir} to CMAKE_LIBRARY_PATH
X-Git-Tag: 2015-4~11497
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f47ada62a3da879006e7cb27479dc9b72c56e923;p=openembedded-core.git

cmake.bbclass: add ${base_libdir} to CMAKE_LIBRARY_PATH

Some libraries like libcrypto.so are installed at base_libdir
instead of libdir. So add the base_libdir to CMAKE_LIBRARY_PATH
so that these libraries can be found correctly.

This resolves an issues with libzypp, which was not finding the
libcrypo library correctly in an x32 build.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 8aec759872..dcd974ab2d 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -59,7 +59,7 @@ set( CMAKE_INSTALL_RPATH ${OECMAKE_RPATH} )
 set( CMAKE_MODULE_PATH ${STAGING_DATADIR}/cmake/Modules/ )
 
 # add for non /usr/lib libdir, e.g. /usr/lib64
-set( CMAKE_LIBRARY_PATH ${libdir} )
+set( CMAKE_LIBRARY_PATH ${libdir} ${base_libdir})
 
 EOF
 }