Просмотр исходного кода

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>
Peter Korsgaard 4 лет назад
Родитель
Сommit
47afc80adf
1 измененных файлов с 5 добавлено и 0 удалено
  1. 5 0
      support/dependencies/check-host-cmake.mk

+ 5 - 0
support/dependencies/check-host-cmake.mk

@@ -3,7 +3,12 @@
 # package is bumped or a new one added, and it requires a higher
 # package is bumped or a new one added, and it requires a higher
 # version, our cmake infra will catch it and build its own.
 # 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
 BR2_CMAKE_VERSION_MIN = 3.10
+endif
 
 
 BR2_CMAKE_CANDIDATES ?= cmake cmake3
 BR2_CMAKE_CANDIDATES ?= cmake cmake3
 BR2_CMAKE ?= $(call suitable-host-package,cmake,\
 BR2_CMAKE ?= $(call suitable-host-package,cmake,\