buildroot/package/pkg-cmake.mk, branch 2017.02

pkg-cmake: pass _CONF_ENV for the target configure step

2017-02-26T21:40:01+00:00

The Buildroot manual documents that _CONF_ENV is passed in the environment when calling cmake during the configure step. However, the actual implementation in pkg-cmake passes HOST__CONF_ENV when configuring the host variant of a cmake package, but does not pass _CONF_ENV when configuring the target variant of a cmake package. This commit fixes that by passing _CONF_ENV in the environment as expected. It should not cause any behavior change, because this feature is in fact not used by any package in upstream Buildroot: $ grep CONF_ENV $(git grep -l cmake-package package/) package/pkg-cmake.mk:$(2)_CONF_ENV ?= package/pkg-cmake.mk: $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ package/pkg-cmake.mk: $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ This issue was reported by Olivier as bug #9616. Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard

package/pkg-cmake.mk: move CMAKE_BUILD_TYPE definition into toolchainfile.cmake

2016-10-22T14:15:32+00:00

The chosen CMAKE_BUILD_TYPE encodes an option of the Buildroot configuration, so it makes more sense to save it in the toolchainfile.cmake than to pass it during configure. It is still possible to override the build type on the cmake command line. Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Maxime Hadjinlian Signed-off-by: Samuel Martin Reviewed-by: Arnout Vandecappelle (Essensium/Mind) [Thomas: reword description in the CHANGES file.] Signed-off-by: Thomas Petazzoni

Revert "package/cmake: with BR2_ENABLE_DEBUG use RelWithDebInfo"

2016-10-22T14:14:07+00:00

This reverts commit 4b0120183404913f7f7788ef4f0f6b51498ef363. Before reverting this patch, CMake packages are built with the following options: * if BR2_ENABLE_DEBUG is set: The CMake build type is set to RelWithDebInfo, which means: - Optimization level is forced to: -O2; - no log nor assert due to -DNDEBUG; - BR2_DEBUG_{1..3} effect is unchanged; * otherwise: The CMake build type is set to Release, which means: - Optimization level is forced to: -O3; - no log nor assert due to -DNDEBUG (as expected). In any case, the optimization WRT the binary size is always ignored and forced. Reverting to the previous situation, so Buildroot now chooses between the 'Debug' and 'Release' config types, which are semantically closer to what Buildroot does everywhere else: * if BR2_ENABLE_DEBUG is set: The CMake build type is set to Debug, which means: - only -g option is passed by CMake; - optimization is not forced, nor debug level, so they are kept as-is; * otherwise: The CMake build type is set to Release, so no change in this case: - Optimization level is forced to: -O3; - no log nor assert due to -DNDEBUG (as expected); - size optimization is ignored. Follow-up patches will fix the CMake flag variables that are appended by CMake. Cc: Charles Hardin Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Maxime Hadjinlian Signed-off-by: Samuel Martin Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni

core: don't build host-cmake if it is available on the build host

2016-09-17T14:12:06+00:00

Currently all cmake packages depend on host-cmake. Unfortunately host-cmake takes a long time to configure and build: almost 7 minutes on a dual-core i5 with SSD. The time does not change even with ccache enabled. Indeed, building host-cmake is avoidable if it is already installed on the build host: CMake is supposed to be quite portable, and the only patch in Buildroot for the CMake package seems to only affect target-cmake. Thus we automatically skip building host-cmake and use the one on the system if: - cmake is available on the system and - it is recent enough. First, we leverage the existing infrastructure in support/dependencies/dependencies.mk to find out whether there's a suitable cmake executable on the system. Its path can be passed in the BR2_CMAKE environment variable, otherwise it defaults to "cmake". If it is enabled, found and suitable then we set BR2_CMAKE_HOST_DEPENDENCY to empty; otherwise we set BR2_CMAKE_HOST_DEPENDENCY to 'host-cmake' and override BR2_CMAKE with "$(HOST_DIR)/usr/bin/cmake" to revert to using our own cmake (the old behaviour). Then in pkg-cmake.mk we replace the hard-coded dependency on host-cmake to using the BR2_CMAKE_HOST_DEPENDENCY variable, and we use $(BR2_CMAKE) instead of $(HOST_DIR)/usr/bin/cmake. Unlike what we do for host-tar and host-xzcat, for host-cmake we do not add host-cmake to DEPENDENCIES_HOST_PREREQ. If we did, host-cmake would be a dependency for _any_ package when it's not installed on the host, even when no cmake package is selected. Cmake versions older than 3.0 are affected by the bug described and fixed in Buildroot in ef2c1970e4bf ("cmake: add patch to fix Qt mkspecs detection"). The bug was fixed in upstream CMake in version 3.0 [0]. Amongst all the cmake packages currently in Buildroot, the currently highest version mentioned in cmake_minimum_required() is 3.1 (grantlee and opencv3). Thus we use 3.1 as the lowest required cmake for now, until a package is bumped, or a new package added, with a higher required version. [0] https://cmake.org/gitweb?p=cmake.git;h=e8b8b37ef6fef094940d3384df5a1d421b9fa568 Signed-off-by: Luca Ceresoli Cc: Samuel Martin Cc: Davide Viti Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Reviewed-by: Romain Naour Tested-by: Romain Naour [yann.morin.1998@free.fr: - simplify logic in check-host-cmake.mk; - set and use BR2_CMAKE_HOST_DEPENDENCY, drop USE_SYSTEM_CMAKE; - bump to cmake 3.1 for grantlee and opencv; ] Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni

cmake: move the host-pkgconf dependency from host-cmake to pkg-cmake

2016-07-05T10:18:36+00:00

In 3d475ee0ba4d6eea6aca25594cfe5bb153ac804f a dependency on host-pkgconf was added to host-cmake. It is a workaround to fix build failures for packages that use pkgconf through a cmake module, but do not depend on host-pkgconf as they should. Since it is the package that needs host-pkgconf and not host-cmake itself, move the dependency to the proper place, in pkg-cmake.mk. Also copy the explanation on the mentioned commit as a comment in order to clarify why we do this. Signed-off-by: Luca Ceresoli Cc: Samuel Martin Cc: Thomas Petazzoni Cc: Davide Viti Cc: Arnout Vandecappelle Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: "Yann E. MORIN" [Thomas: - update on top of master - drop empty HOST_CMAKE_DEPENDENCIES, no longer needed since host dependencies are no longer derived from target dependencies.] Signed-off-by: Thomas Petazzoni

pkg-cmake.mk: export the fortran compiler path in the CMake toolchain file

2016-07-03T14:58:11+00:00

Since the fortran support is conditional, only enable it when needed. Signed-off-by: Samuel Martin Signed-off-by: Vicente Olivert Riera Cc: Benjamin Kamath Signed-off-by: Thomas Petazzoni

infra: remove auto derivation of host dependencies

2016-07-03T08:24:02+00:00

This feature consists in automatically deducing dependencies of a host package from the dependencies of the target variant. However, it causes some issues, and many host packages need different dependencies than their target variants. Now that host dependencies are explicitly set for all packages, we can remove it. Signed-off-by: Julien Floret Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni

package/cmake: with BR2_ENABLE_DEBUG use RelWithDebInfo

2016-07-01T21:36:16+00:00

>From the documentation on BR2_ENABLE_DEBUG, the intention is to get a build with debug symbols and not a "debug build" since that can have the unintended consequence of being a different code path then a release build type definition. Switch the "Debug" to "RelWithDebInfo" in the cmake package support to accomodate getting the debug symbols and still be a release build. Signed-off-by: Charles Hardin Reviewed-by: Samuel Martin Signed-off-by: Thomas Petazzoni

package-cmake: remove now-redundant target ccache support

2015-10-04T16:22:20+00:00

All the complexity with the different ways that CMAKE_C_COMPILER and CMAKE_C_COMPILER_ARG1 can be set are no longer needed, it's all handled by the toolchain wrapper now. Note that it is still necessary to handle this for the host build. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard

pkg-cmake: change sed expression delimiter

2015-09-22T14:23:23+00:00

Switch from : to # since CFLAGS can include :'s spilled in from BR2_TARGET_OPTIMIZATION, for example: BR2_TARGET_OPTIMIZATION="-Wl,-rpath,/lib:/usr/lib" would cause the sed expression to fail thus breaking the build. Signed-off-by: Gustavo Zacarias Reviewed-by: Samuel Martin Signed-off-by: Thomas Petazzoni