[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2604/8267] cmake-native: prefer native sysroot libraries over host



commit 8aa8d1459272b1158b415014b89bffbe99cc05c8
Author: Ross Burton <ross burton intel com>
Date:   Thu Sep 22 17:11:47 2016 +0100

    cmake-native: prefer native sysroot libraries over host
    
    Explicitly set CMAKE_LIBRARY_PATH so that find_library() looks in the native
    sysroot before the host.
    
    Also pass --verbose to configure which sets CMAKE_VERBOSE_MAKEFILE for detailed
    compile logs.
    
    (From OE-Core rev: 89b28990ff3ef8ac7a33a0a3f9177b9bd0e1530b)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-devtools/cmake/cmake-native_3.6.1.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.6.1.bb 
b/meta/recipes-devtools/cmake/cmake-native_3.6.1.bb
index a301ae6..aec0d64 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.6.1.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.6.1.bb
@@ -12,6 +12,7 @@ do_configure[cleandirs] = "${B}"
 
 # Disable ccmake since we don't depend on ncurses
 CMAKE_EXTRACONF = "\
+    -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \
     -DBUILD_CursesDialog=0 \
     -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
     -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
@@ -21,7 +22,7 @@ CMAKE_EXTRACONF = "\
 "
 
 do_configure () {
-       ${S}/configure --prefix=${prefix} -- ${CMAKE_EXTRACONF}
+       ${S}/configure --verbose --prefix=${prefix} -- ${CMAKE_EXTRACONF}
 }
 
 do_compile() {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]