@@ -105,6 +105,11 @@ config BR2_HOSTARCH_NEEDS_IA32_COMPILER
config BR2_NEEDS_HOST_UTF8_LOCALE
bool
+# Hidden boolean selected by packages that need the host to have a
+# cmake >= 3.10.
+config BR2_NEEDS_HOST_CMAKE_3_10
+ bool
+
source "arch/Config.in"
menu "Build options"
@@ -23,11 +23,12 @@ comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gc
config BR2_PACKAGE_WEBKITGTK
bool "webkitgtk"
depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu
+ depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu, host-cmake
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6
depends on BR2_TOOLCHAIN_USES_GLIBC
depends on BR2_PACKAGE_LIBGTK3
depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
+ select BR2_NEEDS_HOST_CMAKE_3_10
select BR2_PACKAGE_CAIRO
select BR2_PACKAGE_CAIRO_PNG
select BR2_PACKAGE_ENCHANT
@@ -32,12 +32,13 @@ config BR2_PACKAGE_WPEWEBKIT
depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu
depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6
- depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu
+ depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu, host-cmake
depends on BR2_USE_WCHAR # icu, libsoup
depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy
depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy
depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wpebackend-fdo
depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS
+ select BR2_NEEDS_HOST_CMAKE_3_10
select BR2_PACKAGE_CAIRO
select BR2_PACKAGE_CAIRO_PNG
select BR2_PACKAGE_HARFBUZZ
@@ -3,7 +3,11 @@
# package is bumped or a new one added, and it requires a higher
# version, our cmake infra will catch it and build its own.
#
+ifeq ($(BR2_NEEDS_HOST_CMAKE_3_10),y)
+BR2_CMAKE_VERSION_MIN = 3.10
+else
BR2_CMAKE_VERSION_MIN = 3.8
+endif
BR2_CMAKE_CANDIDATES ?= cmake cmake3
BR2_CMAKE ?= $(call suitable-host-package,cmake,\