summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-03-12 09:28:10 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-12 17:46:16 +0000
commitf47ada62a3da879006e7cb27479dc9b72c56e923 (patch)
tree20cde0b8169da9d52a3d2191fc34ea6cf36402ef
parent01c1a0f7671871b4fafaed0712ecdece5c21216b (diff)
downloadopenembedded-core-f47ada62a3da879006e7cb27479dc9b72c56e923.tar.gz
openembedded-core-f47ada62a3da879006e7cb27479dc9b72c56e923.tar.bz2
openembedded-core-f47ada62a3da879006e7cb27479dc9b72c56e923.tar.xz
openembedded-core-f47ada62a3da879006e7cb27479dc9b72c56e923.zip
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>
-rw-r--r--meta/classes/cmake.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 8aec75987..dcd974ab2 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
}