Patchwork [1/1] cmake.bbclass: add ${base_libdir} to CMAKE_LIBRARY_PATH

login
register
mail settings
Submitter Nitin A Kamble
Date March 12, 2012, 4:28 p.m.
Message ID <537de2381d30818bbc1bd0758f4fb1a8dc7f49de.1331569628.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/23039/
State Accepted
Commit f47ada62a3da879006e7cb27479dc9b72c56e923
Headers show

Comments

Nitin A Kamble - March 12, 2012, 4:28 p.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

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>
---
 meta/classes/cmake.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Otavio Salvador - March 12, 2012, 5:11 p.m.
Acked-by: Otavio Salvador <otavio@ossystems.com.br>

On Mon, Mar 12, 2012 at 13:28,  <nitin.a.kamble@intel.com> wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
> 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>
> ---
>  meta/classes/cmake.bbclass |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
> index 8aec759..dcd974a 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
>  }
> --
> 1.7.6.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 8aec759..dcd974a 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
 }