aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2021-01-29 10:57:10 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2021-01-30 11:44:07 +0100
commitd65cdf4aeabffcc56f05d90b4b3a138d3b11bf44 (patch)
tree0d601e119e4c6ceddb389535b6e921c4e79de575
parent3d7f510cc1b0c5fb21cdad0d9395005d9a74b5b3 (diff)
downloadbuildroot-d65cdf4aeabffcc56f05d90b4b3a138d3b11bf44.tar.gz
buildroot-d65cdf4aeabffcc56f05d90b4b3a138d3b11bf44.tar.bz2
support/dependencies/check-host-cmake.mk: gerbera needs cmake 3.14+
Fixes: http://autobuild.buildroot.net/results/871/8717612ae32cc491b868f37fbbc960c16b562877/ Since the security bump to gerbera 1.6.4, gerbera now needs cmake 3.14+, whereas Buildroot currently enforces 3.10+. As a fix, bump the requirement to 3.14+ when gerbera is enabled. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--support/dependencies/check-host-cmake.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk
index 01f38da376..33281f0bcc 100644
--- a/support/dependencies/check-host-cmake.mk
+++ b/support/dependencies/check-host-cmake.mk
@@ -3,7 +3,12 @@
# 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_PACKAGE_GERBERA),y)
+# gerbera needs 3.14+
+BR2_CMAKE_VERSION_MIN = 3.14
+else
BR2_CMAKE_VERSION_MIN = 3.10
+endif
BR2_CMAKE_CANDIDATES ?= cmake cmake3
BR2_CMAKE ?= $(call suitable-host-package,cmake,\