summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-08-20 16:57:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-23 07:50:00 +0100
commitb92717ae485dcde5aa0f477d1e5fcc3205ed7a23 (patch)
tree2f82a7f73f536d1feadae9b17ac9664cecfe783d /meta
parent68b5efe8b5bf5daecc3d3594fa2df159f54124a6 (diff)
downloadpoky-b92717ae485dcde5aa0f477d1e5fcc3205ed7a23.tar.gz
cmake-native: fix to function correctly in case of eSDK
Our eSDK is expected to provide traditional SDK's functionality. But for cmake, it could not function well in eSDK. This problem is discovered by the assimp.py test case. The error message is as below. testsdkext/tmp/sysroots/x86_64/usr/lib/libz.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status The problem is about cmake-native being unable to find the correct lib. nativesdk-cmake has solved this problem. So make use of the solution to solve the eSDK problem. (From OE-Core rev: c0561e930e688890eb5feb4521b2de196137227a) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.11.4.bb16
1 files changed, 15 insertions, 1 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.11.4.bb b/meta/recipes-devtools/cmake/cmake-native_3.11.4.bb
index 9f371e9b0c..f55c519c8c 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.11.4.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.11.4.bb
@@ -3,7 +3,12 @@ inherit native
3 3
4DEPENDS += "bzip2-replacement-native expat-native xz-native zlib-native curl-native" 4DEPENDS += "bzip2-replacement-native expat-native xz-native zlib-native curl-native"
5 5
6SRC_URI += "file://0004-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch" 6SRC_URI += "file://0004-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \
7 file://OEToolchainConfig.cmake \
8 file://environment.d-cmake.sh \
9 file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \
10 "
11
7 12
8B = "${WORKDIR}/build" 13B = "${WORKDIR}/build"
9do_configure[cleandirs] = "${B}" 14do_configure[cleandirs] = "${B}"
@@ -31,6 +36,15 @@ do_compile() {
31 36
32do_install() { 37do_install() {
33 oe_runmake 'DESTDIR=${D}' install 38 oe_runmake 'DESTDIR=${D}' install
39
40 # The following codes are here because eSDK needs to provide compatibilty
41 # for SDK. That is, eSDK could also be used like traditional SDK.
42 mkdir -p ${D}${datadir}/cmake
43 install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/
44 mkdir -p ${D}${base_prefix}/environment-setup.d
45 install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${base_prefix}/environment-setup.d/cmake.sh
34} 46}
35 47
36do_compile[progress] = "percent" 48do_compile[progress] = "percent"
49
50SYSROOT_DIRS_NATIVE += "${datadir}/cmake ${base_prefix}/environment-setup.d"