aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
AgeCommit message (Collapse)Author
2018-08-24swig: Remove superfluous python dependencyJoshua Watt
The actual dependency on native Python and is handled by inheriting python3native Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-23distcc: 3.3 -> 3.3.2Robert Yang
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-23elfutils: 0.172 -> 0.173Robert Yang
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-23diffstat: 1.61 -> 1.62Robert Yang
Refresh avoid-check-user-break-cc.patch to fix fuzz warning. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-23strace: 4.23 -> 4.24Robert Yang
Remove backported patch 0001-tests-fix-build-with-fresh-glibc.patch. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-23patch: fix CVE-2018-6952Hongxu Jia
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-23perl: CVE-2018-12015Jagadeesh Krishnanjanappa
Remove existing files before overwriting them Archive should extract only the latest same-named entry. Extracted regular file should not be writtent into existing block device (or any other one). https://rt.cpan.org/Ticket/Display.html?id=125523 Affects perl <= 5.26.2 Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-23perl: avoid using += with an over-rideAndre McCurdy
Using += with an over-ride can be a source of confusion so try to avoid the construct in core recipes. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-23libxml-parser-perl: fix "...contains bad RPATH"Jens Rehsack
The perl distribution "XML-Parser" relies for configuration on the tooling of Devel::CheckLib - which is not aware of sysroot locations nor of reasonable compiler/link definitions from outside. This causes ERROR: libxml-parser-perl-2.44-r0 do_package_qa: QA Issue: package libxml-parser-perl contains bad RPATH ${BUILDDIR}/tmp/work/core2-64-poky-linux/libxml-parser-perl/2.44-r0/recipe-sysroot/usr/lib in file ${BUILDDIR}/tmp/work/core2-64-poky-linux/libxml-parser-perl/2.44-r0/packages-split/libxml-parser-perl/usr/lib/perl/vendor_perl/5.24.4/auto/XML/Parser/Expat/Expat.so package libxml-parser-perl contains bad RPATH ${BUILDDIR}/tmp/work/core2-64-poky-linux/libxml-parser-perl/2.44-r0/recipe-sysroot/usr/lib in file ${BUILDDIR}/tmp/work/core2-64-poky-linux/libxml-parser-perl/2.44-r0/packages-split/libxml-parser-perl/usr/lib/perl/vendor_perl/5.24.4/auto/XML/Parser/Expat/Expat.so [rpaths] ERROR: libxml-parser-perl-2.44-r0 do_package_qa: QA run found fatal errors. Please consider fixing them. ERROR: libxml-parser-perl-2.44-r0 do_package_qa: Function failed: do_package_qa It's strongly encouraged to the maintainer @toddr to rework the toolchain for up to date environments. [RP: Added fix for nativesdk RPATH issues too] Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-23pkgconf: upgrade 1.4.2 -> 1.5.3Maxin B. John
Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-23mtools: fix race issue while mtools invoked frequentlyHongxu Jia
While invoking mtools frequently, the unblocking request caused race issue. Here is an example of syslinux [snip] dd if=/dev/zero of=floppy.img bs=1024 count=144 losetup /dev/loop1 floppy.img mkdosfs /dev/loop1 syslinux -i /dev/loop1 |plain floppy: device "/proc/6351/fd/3" busy (Resource temporarily unavailable): |Cannot initialize 'S:' |Bad target s:/ldlinux.sys [snip] The idea is from: https://bugzilla.redhat.com/show_bug.cgi?id=1235016 https://groups.google.com/a/chromium.org/forum/#!msg/chromium-os-dev/bRPUCFHoBTQ/ZjB8kjjx1vUJ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-23cmake-native: fix to function correctly in case of eSDKChen Qi
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. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-23nasm: fix CVE-2018-8883 & CVE-2018-8882 & CVE-2018-10316Hongxu Jia
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-21python/python3: add virtual/crypt to DEPENDSHongxu Jia
Since `6146b8c glibc: Disable crypt support in glibc' in oe-core, python2/3 could not find symbol crypt which caused import crypt failed. [snip] >>> import crypt Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/usr/lib64/python3.5/crypt.py", line 3, in <module> import _crypt ImportError: /usr/lib64/python3.5/lib-dynload/_crypt.cpython-35m-x86_64-linux-gnu.so: undefined symbol: crypt [snip] Add virtual/crypt to DEPENDS, and python's build system (setup.py) will search libcrypt.so in recipe-sysroot and add `-lcrypt' if it exists. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-21llvm: Enable AMDGPU backend for native/native-sdk builds tooKhem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-21llvm: Use HOST_ARCH in LLVM_TARGETS_TO_BUILD for buildsKhem Raj
LLVM_TARGETS_TO_BUILD is needed to represent HOST_ARCH for builds and target specific additions should use class-target override Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-21gdb: Alias rpl_stat to stat() on muslKhem Raj
Use CPPFLAGS instead of CFLAGS since there is C++ compiler being used for somefiles Fixes gdb/gdbserver/../../../gdb-8.1.1/gdb/gdbserver/../common/common-utils.c:419: undefined reference to `rpl_stat' | collect2: error: ld returned 1 exit status | make[4]: *** [Makefile:414: libinproctrace.so] Error 1 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-21gdb: Upgrade to 8.1.1Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-21autoconf: update runtime perl module dependenciesMikko Rapeli
Test in SDK was failing to execute: $ autoreconf --install --force due to missing perl modules. Add the needed perl modules for target build: perl-module-bytes perl-module-thread-queue perl-module-threads Duplicate the perl module dependencies for SDK as well. Now autoreconf runs with a trivial example. Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-20python3-git: update to version 2.1.11Derek Straka
Update to the latest stable release Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-20python3-gitdb: update to version 2.0.4Derek Straka
Update to the latest stable release Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-20python3-pip: update to version 18.0Derek Straka
License-Update: Update checksum for copyright year changes Update to the latest stable version Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-20binutils: Update past 2.31.1 releaseKhem Raj
list of changes in this rev bump * a69de9c7cf ld-x86-64/pr23486b.d: Swap pr23486a.s and pr23486a.s * 28a27bdbb9 x86: Properly add X86_ISA_1_NEEDED property * d692290444 x86: Replace evex-no-scale.s with evex-no-scale-[32|64].s * d55c3e3609 x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED * 381c1eb6ec x86: Update assembler tests for non-ELF targets * 9b075c7167 x32: Align the .note.gnu.property section to 4 bytes * 4aa5eb02fd __tls_get_addr_opt stubs and tocsave optimization * 95fbde6791 Re: PowerPC64 __tls_get_addr_opt stub .eh_frame fix * 079a6882b5 PowerPC64 __tls_get_addr_opt stub .eh_frame fix * 1d8f56a971 Updated Bulgarian translation for the ld/ directory * b7991db94c Add --warn-drop-version option; by default, do not warn when discarding version info. * dbf924a63a Fix type checking errors. * 60b3b24ca1 Fix spurious check-ld failures on aarch64-elf * feaed90494 [PATCH, LD, AArch64] Fix ifunc testisms * 2069ccaf8d x86: don't mistakenly scale non-8-bit displacements * 254ade2586 Fix unwind offset for call_info->start_symbol. * 29153520a8 S/390: Set the htm flag on PPA * 6737a6b34f x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed * 01683b308a x86: Split vcvtps2{,u}qq and vcvttps2{,u}qq * be8a252e18 Set the development flag back to true. * 0860693812 (tag: binutils-2_31_1) Regenerate files and add changelog entries for 2.31.1 release * 4afd6a72e3 Fix typo in src-release.sh script. Update French translation for gold and Spanish translation for ld. Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-20llvm: Use YOCTO_ALTERNATE_MULTILIB_NAME environment variable in llvm-configKhem Raj
llvm-config is a tool on similar veins as pkg-config but provides a lot more information and packages which use llvm e.g. mesa use this tool to poke for llvm related informaiton e.g. version, libpath, includepaths to name a few, this has few challanges in cross build environments where llvm-config is supposed to be build for buildhost but provide information about target llvm which is addressed by building native llvm-config along with target llvm build, but this is frowned upon by OE build system since it detects that host paths are being used so we have to build it as part of llvm-native but then it means install paths for llvm and llvm-native are different and wrong paths get reported when llvm-config is used. This is solved by providing YOCTO_ALTERNATE_EXE_PATH variable to let llvm-config use that path instead of self-relative path to report back Second problem is when building multi-lib packages base_libdir is different for target packages but native llvm-config does not know about it so it reports non-multilibbed paths as libdir and packages can not find llvm in sysroot. This is fixed by adding another environment variable YOCTO_ALTERNATE_MULTILIB_NAME which can be set from recipes to set proper multilib path Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-20llvm: Point llvm-config to one built with llvm-nativeKhem Raj
If not defined, llvm build system tries to build one which then confuses the OE QA system since its building native tool and target packages in same package build moreover it is not required since we already have it via llvm-native Fixes ERROR: llvm-6.0-r0 do_package_qa: QA Issue: llvm: The compile log indicates that host include and/or library paths were used. Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-19vala: refresh patchMaxin B. John
Refresh the following patch: "disable-graphviz.patch" to fix this warning: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: checking file configure.ac checking file libvaladoc/Makefile.am checking file libvaladoc/html/basicdoclet.vala checking file libvaladoc/html/htmlmarkupwriter.vala Hunk #1 succeeded at 51 with fuzz 1 (offset 8 lines). Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-16python3: enable profile optimized buildsAnuj Mittal
Enable profile guided optimization (pgo) for python3. Enabling pgo in python is generally as simple as invoking the target profile-opt which: - builds python binaries with profile instrumentation enabled, - runs a specific profile task using that python to get the profile data and, - feeds the compiler with this profile data and rebuilds python. This change invokes qemu-user for the second step of running a profile task using target python. Depending on how long profile task takes to run, this might add a significant time to compilation (which would be true for native builds too). The default profile task can be changed by the users depending on what makes sense for their use case (or can be left empty). In case qemu-user isn't supported, profile task won't be run. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-16qemu: Upgrade QEMU 2.12 -> 3.0Alistair Francis
Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-16llvm: Update to 6.0.1Khem Raj
Drop upstreamed patch Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-16elfutils: check data_list.data.d.d_buf before free itRobert Yang
[YOCTO #12791] The one which actually saves the data is data_list.data.d.d_buf, so check it before free rawdata_base. This can fix a segmentation fault when prelink libqb_1.0.3: prelink: /usr/lib/libqb.so.0.18.2: Symbol section index outside of section numbers The segmentation fault happens when prelink call elf_end(). Fixed: MACHINE="qemux86-64" IMAGE_INSTALL_append = " libqb" #libqp is from meta-openembedded $ bitbake core-image-minimal Segmention fault Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2018-08-16prelink: use ehdr.e_shstrndx as index rather than ehdr.e_shnumRobert Yang
[YOCTO #12791] According to struct elf32_hd, the e_shnum is section header number, and the index is e_shstrndx, not e_shnum. This can fix segmention fault when handle libqb.so.0.18.2 from libqb_1.0.3. It fails to handle libqb.so.0.18.2 and get errors: Symbol section index outside of section numbers Then segmentation fault, this is because the e_shnum is 34, while e_shstrndx is 27 (it would be 33 when no errors), I've checked several elf files to confirm that the ones after e_shstrndx is NULL, so use e_shstrndx should be correct. Fixed: MACHINE="qemux86-64" IMAGE_INSTALL_append = " libqb" #libqp is from meta-openembedded $ bitbake core-image-minimal Segmention fault Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2018-08-16binutils: Improve check for input file matching output fileRobert Yang
When the assembler reports that the input and output are the same, report the file names involved, in order to help debugging. Also do not equate two files are the same if the have the same inode value but reside on different file systems. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2018-08-15swig: fix gcc8 warnings for cast between incompatible function typesYi Zhao
We got an error when building setools in meta-selinux: setools/policyrep/qpol_wrap.c:1819:23: error: cast between incompatible function types from 'PyObject * (*)(PyObject *)' {aka 'struct _object * (*)(struct _object *)'} to 'PyObject * (*)(PyObject *, PyObject *)' {aka 'struct _object * (*)(struct _object *, struct _object *)'} [-Werror=cast-function-type] {(char *)"disown", (PyCFunction)SwigPyObject_disown, METH_NOARGS, (char *)"releases ownership of the pointer"}, This is a swig issue. See: https://github.com/swig/swig/issues/1259 Backport a patch from upstream to fix it. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-15meson: Support building allarch recipes againPeter Kjellerstedt
This registers "allarch" as a known CPU family. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-15meson: Split validate-cpu.patch in threePeter Kjellerstedt
This makes it more suitable to work with, e.g., devtool. It also prepares for the update to 0.47.0 when the first patch will no longer be needed (as it is a backport). Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-14glide: add INSANE_SKIP for textrelMartin Jansa
* I'm not using glide, so I'm not going to fix it proplerly, it was just bothering me in world builds * this is reproducible only with ptest in DISTRO_FEATUREs (for aarch64 issue) and included security_flags.inc, more specifically with the PIE flags, so alternative work around is: SECURITY_CFLAGS_pn-glide = "${SECURITY_NOPIE_CFLAGS}" Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-14go(-dep): add INSANE_SKIP for textrelMartin Jansa
* I'm not using go or go-dep, so I'm not going to fix it proplerly, it was just bothering me in world builds * this is reproducible only with ptest in DISTRO_FEATUREs (for aarch64 issue) and included security_flags.inc, more specifically with the PIE flags, so alternative work around is: SECURITY_CFLAGS_pn-go = "${SECURITY_NOPIE_CFLAGS}" SECURITY_CFLAGS_pn-go-dep = "${SECURITY_NOPIE_CFLAGS}" Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-14libtool-cross: Handle ccache sstate 'infection' issuesRichard Purdie
On a system without ccache, f you: INHERIT += "ccache" bitbake libtool-cross <remove INHERIT> bitbake apmd then it fails due to being unable to find ccache. The references to ccache are coded into libtool-cross but the sstate checksum doesn't reflect this due to the way the class is coded (output should be the same regardless). The simplest solution is to remove references to ccache from the libtool script. The output then works regardless of whether ccache is present or not. The libtool-cross script is only used in a handful of cases (most of the time its dynamically generated by autoconf) so any performance issue is minor. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-14cmake: fix compiling some C++ projects with Yocto SDK and GCCUrs Fässler
Setting CMAKE_SYSROOT in the toolchain file allows CMake to correctly remove user-provided system include directories pointing to <sysroot>/usr/include. The mentioned projects failed with "stdlib.h: No such file or directory #include_next <stdlib.h>". Signed-off-by: Urs Fässler <urs.fassler@bbv.ch> Signed-off-by: Raphael Freudiger <raphael.freudiger@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-09binutils: enable x86_64-pep for producing EFI binaries on x86-64Christopher Clark
Add x86_64-pep emulation support to the set enabled for x86_64 targets to enable the linker to produce Portable Executables for EFI binaries. Enables building the x86-64 EFI variant of the Xen hypervisor for the OpenXT Project. Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2018-08-08file: Update to 5.34Khem Raj
Distros which have glibc 2.28 on them otherwsise fail to build due to some syscall mismatches Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-08strace: Fix build with glibc 2.28Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-08bison: Fix build break with glibc 2.28Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-08bootchart2: Update to master-tipKhem Raj
This has several fixes to get it building with glibc 2.28+ remove backported patch which is not needed now Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-08m4: Workaround gnulib's fseeko.c implementationKhem Raj
exposed by glibc 2.28 for details see https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-08vala:0.40.4 -> 0.40.8Hong Liu
Upgrade vala from 0.40.4 to 0.40.8 Signed-off-by: Hong Liu <hongl.fnst@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-08createrepo-c:0.10.0 -> 0.11.0Hong Liu
Upgrade createrepo-c from 0.10.0 to 0.11.0 Signed-off-by: Hong Liu <hongl.fnst@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-07meson: Add risc-v to known architecturesKhem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-07desktop-file-utils: allow target/nativesdk build, not just nativeRoss Burton
Also fix the license, as this is GPLv2+ not just v2. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-07cmake: fix linking in multilib SDKsRoss Burton
CMake, in it's infinite wisdom, when searching for libraries (using find_library) will look inside the libraries PREFIX/lib, PREFIX/lib32, and PREFIX/lib64. In a multilib SDK more than one of these will exist (potentially all three) and obviously for a given build configuration only one of those is valid. This search path is hard-coded deep inside CMake but by setting CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX we can bypass it and set an explicit lib<SUFFIX> to use. Do this by writing ${baselib} into the environment file, and then stripping "lib" from this to obtain the suffix in the cmake-specific environment script, which is then read in the CMake toolchain. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>