This updates CMake to the 3.12.1 stable release. All patches were
rebase on top of the new source file and all them applied without
changes.
The number of patches has changed as all them were applied on the Git
tree and re-exported, to avoid any fuzzy warnings.
License-Update: new contributor added in Copyright.txt
(From OE-Core rev: 439be401cd642937b45796489e8c10aa5238a963)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>".
(From OE-Core rev: cb42802f2fe1760f894a435b07286bca3a220364)
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>
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.
(From OE-Core rev: 47160a8c51310f2b40cabf4c1910b5df6e0a15d6)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Previously cmake-dev held some files which should be in cmake.
- cmake.m4 should be in installed in cmake so it can be used out of the box
- nativesdk-specific OEToolchainConfig.cmake file used to be in cmake, but the
change of default packaging rules move it into cmake-dev. This recipe is the
exception and it should be moved back.
Add the extra paths to cmake, and clear FILES for cmake-dev to ensure nothing
else slips in.
(From OE-Core rev: a6ce79b87d3db57033a3d1710cb3292366a0a8f7)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Patch the location in cmake where the toolchain file is loaded
to use the (new) OE_CMAKE_TOOLCHAIN_FILE variable to select a default
toolchain if no toolchain has been specified. The cmake alias is
removed.
The alternatives:
- shell alias fails when cmake is called indirectly (ex: a makefile
managing several projects which calls cmake for some of them)
because aliases are not inherited
- wrapper script that unconditionally adds "-D..." breaks cmake's
build tests and many other things as it causes cmake to believe it
should be configuring things when it should not be. For example,
`cmake -DCMAKE_TOOLCHAIN_FILE=... --build .` does not work (note
that this also breaks people directly using `cmake --build .` with
the current alias).
(From OE-Core rev: da60be3768e7183794d63548166d107dbd0a4973)
Signed-off-by: Cody P Schafer <dev@codyps.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This updates CMake to the current stable release and drop many
backported patches in the process.
(From OE-Core rev: d942ec4ff649782d22afe49fd48839dbbfedc871)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
,----[ Changes in 3.10.3 ]
| Brad King (1):
| CMake 3.10.3
|
| Craig Scott (1):
| GoogleTest: Rename TIMEOUT parameter to avoid clash
|
| Sebastian Holtermann (1):
| Autogen: Fix for the empty source file crash in 3.10.2
|
| Tianhao Chai (1):
| ccmake: fix status line buffer overflow on very wide terminals
`----
(From OE-Core rev: ae230e1f858f83d1ff063554b49bd3ee1f880f76)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is a minor stable update to CMake. This includes following
changes:
,----
| c1e087a9d CMake 3.10.2
| d592bfc9f Autogen: Ignore not existing source files in cmMakefile
| d49986b3b KWIML: Backport RISC-V update to CMake 3.10
| 9417a6d32 FindPostgreSQL: Add support for PG10
| 683e9023a Autogen: Fix for problematic nested list separator
| 9b4d31dc7 cmGraphVizWriter: Updated to create and follow dependers for
| interface targets
`----
(From OE-Core rev: 798dba6fb3e16d3041b01faecfd32c787c142ee8)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The 3.10.1 version has been in Dec 13, 2017, and has a great set of
features and improvements since the last upgrade.
The release notes of 3.10 release is available at:
https://cmake.org/cmake/help/v3.10/release/3.10.html
Patches updates:
- cmake-Prevent-the-detection-of-Qt5.patch: so it replaces the sed
command calls inside the cmake.inc
- 0001-FindCUDA-Use-find_program-if-find_host_program-is-no.patch:
merged upstream, so it has been removed.
- support-oe-qt4-tools-names.patch: rebased.
License-checksum-change: added new contributors
(From OE-Core rev: 9e58926f1cea9d5cb18cb923855d1ae98f88a8ac)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This upgrades CMake from 3.8.2 to 3.9.3 release. The Copyright.txt
file checksum change was due the addition of a new contributor on the
contributors list.
(From OE-Core rev: 053ad4bbcb72a1783c7928c2f86285c15472314f)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The missing underscore makes CMake define a new variable named "CMAKE"
with the contents "ASM_FLAGS ${CMAKE_C_FLAGS}" instead of a variable
named "CMAKE_ASM_FLAGS" with contents equal to "CMAKE_C_FLAGS". It seems
clear that the intention was to assign "CMAKE_ASM_FLAGS".
CMake uses variables named "CMAKE_<LANG>_FLAGS" for defining default
compiler flags for a given language <LANG>. Leaving this flag unset may
have unintended consequences. Not doing so is however not an error as
far as CMake is concerned so it is silently accepted.
(From OE-Core rev: 03a4dd085e3be2821eff5a1a1e7e96b809465565)
Signed-off-by: Øystein Walle <ow@datarespons.no>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
CMake does not define the `find_host_program` command we've
been using in the cross-compiling code path. It was
provided by a widely used Android toolchain file. For
compatibility, continue to use `find_host_program` if
available, but otherwise use just `find_program`.
(From OE-Core rev: e5f4e0df64531e2296bb1f5002eb106c3eec61e3)
Signed-off-by: Maxime Roussin-Bélanger <maxime.roussinbelanger@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There was a set of changes, those are:
- CMake now requires librhash for build and as there is no other
users in OE-Core we make it use its internal copy instead;
- Copyright.txt checksum has change due new contrubutors and 2017
year additions;
- Patch avoid-gcc-warnings-with-Wstrict-prototypes.patch was removed
as it is not need anymore;
- Patch 0001-KWIML-tests-Remove-format-security-from-flags.patch was
removed as it is included in this release.
(From OE-Core rev: cc75f693bde412edd0a1aa4fd4e92fb29b492b76)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backport build fix that removes -Wformat-security for specific tests.
Enable "-Wformat-security" for cmake in security_flags.inc.
(From OE-Core rev: b00f9c77ebd211578ba133c28abcbc5752305e25)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The largefile distro feature has been enabled by default in oe-core
for a long time and, more recently, also in poky-tiny. Building
without the largefile distro feature receives little or no testing.
Many packages now enable LFS without exposing a configure option, so
there should be very little expectation that disabling the distro
feature will result in a distro which globally disables LFS.
Respecting the distro feature adds a maintenance over-head and may be
the source of configurations oddities (e.g. dbus-native currently
builds with LFS disabled for no clear reason - fixed by this commit).
Ignore the largefile distro feature more widely, as a first step
towards deprecating and eventually removing it.
(From OE-Core rev: a75ccaea77c8aad8d46e87e8ed4af2e2e0ad5327)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Tested by building gnuradio stack.
(From OE-Core rev: d3e5a6d38870ecede87812cb81c0b5630bd3b3ff)
(From OE-Core rev: 66122e4f19e880f5e48130b318f98452b992cad4)
Signed-off-by: Philip Balister <philip@balister.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The previous string manipulations would result in the wrong string being used
for machines such as intel-corei7-64 as the sysroot was split at the first
hyphen (so would result in corei7 instead of corei7-64).
Change the logic so that it looks for processor-distro-os and uses the whole of
the processor field.
(From OE-Core rev: ce24958d644f2218d5415be574a5b7e1ee8c9b2d)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The other CMAKE_FIND_ROOT_PATH_MODE_* variables were already set to ONLY, but
PACKAGE was left out. Fix this so that cmake doesn't look on the host for cmake
modules when it should only be looking in the target sysroot.
(From OE-Core rev: 2df2372a31b02eab933e4a7aa6d5f8ca48e02c04)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This sets a good example and avoids unnecessarily contributing to
perceived complexity and cargo culting.
Motivating quote below:
< kergoth> the *original* intent was for the function/task to error via
whatever appropriate means, bb.fatal, whatever, and
funcfailed was what you'd catch if you were calling
exec_func/exec_task. that is, it's what those functions
raise, not what metadata functions should be raising
< kergoth> it didn't end up being used that way
< kergoth> but there's really never a reason to raise it yourself
FuncFailed.__init__ takes a 'name' argument rather than a 'msg'
argument, which also shows that the original purpose got lost.
(From OE-Core rev: ff310dd103e16a5345a4bb48090af05f50171de3)
Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
The intention here was "everything but jsoncpp is system provided" so use the
convenience option to ensure this remains true in the future.
(From OE-Core rev: f863b227e22b67ab239ee6124471fdc14de3f017)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
cmake doesn't use autotools, the functions get replaced by either cmake.bbclass
(target) or the recipe itself (native) leaving just lots of superfluous
dependencies.
(From OE-Core rev: b8700e9fd30317d0ad583febb4e6f385284bdd51)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
cmake outputs percentage complete as part of its compilation process, so
we can enable BitBake's new progress scanning for do_compile here.
(From OE-Core rev: f77ea95ba5cd337f01f2a1b4fe9466feb6af9440)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Adjust LIC_FILES_CHKSUM due to changes in the Copyright date.
No change to the license text.
Remove the upstreamed patch:
1. 0001-Add-NIOS2-CPU-support.patch
(From OE-Core rev: 05bce1fda9b24f939d211516ad73984ad29ba4df)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It hasn't been used since June 2015 when upgraded the recipe, this patch
was used for crosscompiling, now the crosscompile works well without it,
so remove it.
(From OE-Core rev: b99eec460cb14dce3580b8f5da6ce8b97d2078c5)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Tested by building gnuradio and friends for a cortex-a9 machine.
(From OE-Core rev: a70d6e683a3cd7bc1b0456dd852e59bad827c5c3)
Signed-off-by: Philip Balister <philip@balister.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Patches "qt4-fail-silent.patch" and "support-oe-qt4-tools-names.patch"
were adapted in order to fit to CMake 3.2.2 (refer to the commit
message in the respective patch for details).
Patch "cmake-2.8.11.2-FindFreetype.patch" was dropped since it was
rejected upstream and its functionality otherwise implemented in the
meantime.
(From OE-Core rev: c171909352b5ed92166857b0bbcd901ae0f74996)
Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
And bump PR to avoid:
| Error when bootstrapping CMake:
| Found directory "/path/to/cmake-2.8.12.2/Bootstrap.cmk".
| Looks like somebody did bootstrap CMake in the source tree, but now you are
| trying to do bootstrap in the binary tree. Please remove Bootstrap.cmk
| directory from the source tree.
(From OE-Core rev: ade72d5bad7303a40f7b27526145ed83e372cd35)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We build cmake-native without acl support. However, the acl.h header
is still being checked which would sometimes cause the following error
during do_compile:
archive_read_disk_entry_from_file.c:38:21: fatal error: sys/acl.h: No such file or directory
| #include <sys/acl.h>
| ^
| compilation terminated.
This happens when the sysroot parts of acl-native is removed between
do_configure and do_compile tasks of cmake-native.
To reproduce the problem manually, execute the following command:
bitbake cmake-native -c cleansstate && bitbake acl-native -c cleansstate && \
bitbake acl-native && bitbake cmake-native -c configure && \
bitbake acl-native -c cleansstate && bitbake cmake-native -c compile
This patch fixes the above problem by explicitly disable the checking for
acl.h header file.
(From OE-Core rev: 3ad1701b0afe59af9d8427d53ffa4c0f52f42805)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch adds a flexible way to configure the CMake in SDKs. It adds
a toolchain configuration script which supports subscripts for
extensions, as for example Qt5.
(From OE-Core rev: 4143f3b0ce0d0c52f5b0babc1bb16ac0ac9610eb)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
