summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-09-13 15:57:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-16 15:24:03 +0100
commitbdb10d8358a635def4b27d4c7b127dcbcee5731b (patch)
tree559fadfe35f68955062abebffe2b2d2bbe65057e /meta
parent04cc7ab0fbea7e70487926205d3a3b1989a56b47 (diff)
downloadpoky-bdb10d8358a635def4b27d4c7b127dcbcee5731b.tar.gz
cmake-native: rationalise system/internal library dependencies
By default cmake will auto-detect if a library is present on the host and if it isn't present will use an internal fork. For some libraries using the internal fork is preferable as it can be built with less dependencies, but for others we're either already building it or the impact of building it is comparable to internal build. Continue to use the internal fork of libarchive as our libarchive-native has a large number of build dependencies. Using the internal libarchive means that system bzip2 and zlib must be used. Explicitly use the internal fork of jsoncpp as we don't have this in oe-core. Explicitly depend on curl-native, expat-native, and xz-native to ensure these dependencies are not floating. curl-native is a non-trivial dependency but is comparable to building the internal fork, so there's no reason to build it twice. Change bzip2-native to bzip2-replacement-native as bzip2-native is ASSUME_PROVIDED. [ YOCTO #9639 ] (From OE-Core rev: f9366799aaf4ad2b98345743c7129fa94d092880) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.6.1.bb6
1 files changed, 4 insertions, 2 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 f3a485fc0e..a301ae664c 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.6.1.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.6.1.bb
@@ -1,8 +1,7 @@
1require cmake.inc 1require cmake.inc
2inherit native 2inherit native
3 3
4# Using cmake's internal libarchive, so some dependencies are needed 4DEPENDS += "bzip2-replacement-native expat-native xz-native zlib-native curl-native"
5DEPENDS += "bzip2-native zlib-native"
6 5
7SRC_URI += "\ 6SRC_URI += "\
8 file://cmlibarchive-disable-ext2fs.patch \ 7 file://cmlibarchive-disable-ext2fs.patch \
@@ -14,6 +13,9 @@ do_configure[cleandirs] = "${B}"
14# Disable ccmake since we don't depend on ncurses 13# Disable ccmake since we don't depend on ncurses
15CMAKE_EXTRACONF = "\ 14CMAKE_EXTRACONF = "\
16 -DBUILD_CursesDialog=0 \ 15 -DBUILD_CursesDialog=0 \
16 -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
17 -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
18 -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \
17 -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \ 19 -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \
18 -DHAVE_SYS_ACL_H=0 \ 20 -DHAVE_SYS_ACL_H=0 \
19" 21"