NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson-package: prevent cmake find_package() picking up host libraries

Browse Source 
The meson build system uses (1) pkg-config and (2) cmake find_package to locate
dependencies and stops only if a package is found. Cmake uses a toolchain file
that is generated by meson from the existing configuration [1].

The cmake toolchain file misses CMAKE_FIND_ROOT_PATH and CMAKE_FIND_ROOT_PATH_*
settings, and find_package() falls back to the default behaviour and looks for
dependencies on the build machine (the Buildroot HOST_DIR).

Use a feature introduced in meson 0.56.0 [2] to pass the Buildroot toolchain
file to cmake instead of using a meson-generated one.

Fixes the following build failures:
http://autobuild.buildroot.org/results/056/05673ed04c6f044f1b56b9d5342d61653be43a18/
http://autobuild.buildroot.org/results/f0a/f0a9e719114f19dc9d20622ed85dd4f8e968c20f/
http://autobuild.buildroot.org/results/527/527ee199813abbacd61c3fa32b517ea60af60659/

[1[ see mesonbuild/cmake/toolchain.py
[2] see https://mesonbuild.com/CMake-module.html#cross-compilation

Signed-off-by: Andreas Ziegler <br015@umbiko.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Andreas Ziegler 2022-04-21 17:25:30 +02:00 committed by Yann E. MORIN
parent add69bdec2
commit 6ab8b1e263
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/pkg-meson.mk
View File

@ -81,6 +81,7 @@ define PKG_MESON_CROSSCONFIG_SED
-e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \
-e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \
-e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \
-e "s%@HOST_DIR@%$(HOST_DIR)%g" \
-e "s%@STAGING_DIR@%$(STAGING_DIR)%g" \
-e "s%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g" \
$(TOPDIR)/support/misc/cross-compilation.conf.in

3
support/misc/cross-compilation.conf.in
View File

@ -26,6 +26,9 @@ needs_exe_wrapper = true
sys_root = '@STAGING_DIR@'
pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig'
pkg_config_static = '@STATIC@'
# enable meson build to pass a toolchain file to cmake
cmake_toolchain_file = '@HOST_DIR@/share/buildroot/toolchainfile.cmake'
cmake_defaults = false
[host_machine]
system = 'linux'