diff options
author | Pascal Bach <pascal.bach@siemens.com> | 2019-04-01 14:16:54 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-04 22:57:32 +0100 |
commit | b04fae7a928b408dcc9d0d3b366d93c675c52a63 (patch) | |
tree | ce9b534d9505db0d885b6c08cf9dc130f5d5e32f /meta/recipes-devtools/cmake/cmake-native_3.14.1.bb | |
parent | b495e757da270e42cfff3c34496d935ebe53762c (diff) | |
download | poky-b04fae7a928b408dcc9d0d3b366d93c675c52a63.tar.gz |
cmake: 3.14.0 -> 3.14.1
The FindFontconfig module added by 3.14.0 accidentally used uppercase
FONTCONFIG_* variable names that do not match our conventions.
3.14.1 revises the module to use Fontconfig_* variable names.
This is incompatible with 3.14.0 but since the module is new in the
3.14 series usage should not yet be widespread.
(From OE-Core rev: 6c85363eea0278a6952e80edb549e80e1fcbdba7)
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake-native_3.14.1.bb')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake-native_3.14.1.bb | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.14.1.bb b/meta/recipes-devtools/cmake/cmake-native_3.14.1.bb new file mode 100644 index 0000000000..fedcf3d4bd --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake-native_3.14.1.bb | |||
@@ -0,0 +1,53 @@ | |||
1 | require cmake.inc | ||
2 | inherit native | ||
3 | |||
4 | DEPENDS += "bzip2-replacement-native expat-native xz-native zlib-native curl-native" | ||
5 | |||
6 | SRC_URI += "file://OEToolchainConfig.cmake \ | ||
7 | file://environment.d-cmake.sh \ | ||
8 | file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ | ||
9 | file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \ | ||
10 | " | ||
11 | |||
12 | |||
13 | B = "${WORKDIR}/build" | ||
14 | do_configure[cleandirs] = "${B}" | ||
15 | |||
16 | # Disable ccmake since we don't depend on ncurses | ||
17 | CMAKE_EXTRACONF = "\ | ||
18 | -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \ | ||
19 | -DBUILD_CursesDialog=0 \ | ||
20 | -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ | ||
21 | -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ | ||
22 | -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \ | ||
23 | -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ | ||
24 | -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \ | ||
25 | -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \ | ||
26 | -DHAVE_SYS_ACL_H=0 \ | ||
27 | " | ||
28 | |||
29 | do_configure () { | ||
30 | ${S}/configure --verbose --prefix=${prefix} \ | ||
31 | ${@oe.utils.parallel_make_argument(d, '--parallel=%d')} \ | ||
32 | ${@bb.utils.contains('CCACHE', 'ccache ', '--enable-ccache', '', d)} \ | ||
33 | -- ${CMAKE_EXTRACONF} | ||
34 | } | ||
35 | |||
36 | do_compile() { | ||
37 | oe_runmake | ||
38 | } | ||
39 | |||
40 | do_install() { | ||
41 | oe_runmake 'DESTDIR=${D}' install | ||
42 | |||
43 | # The following codes are here because eSDK needs to provide compatibilty | ||
44 | # for SDK. That is, eSDK could also be used like traditional SDK. | ||
45 | mkdir -p ${D}${datadir}/cmake | ||
46 | install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ | ||
47 | mkdir -p ${D}${base_prefix}/environment-setup.d | ||
48 | install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${base_prefix}/environment-setup.d/cmake.sh | ||
49 | } | ||
50 | |||
51 | do_compile[progress] = "percent" | ||
52 | |||
53 | SYSROOT_DIRS_NATIVE += "${datadir}/cmake ${base_prefix}/environment-setup.d" | ||