Update buidlroot to version 2016.08.1
This commit is contained in:
7
bsp/buildroot/support/dependencies/check-host-cmake.mk
Normal file
7
bsp/buildroot/support/dependencies/check-host-cmake.mk
Normal file
@@ -0,0 +1,7 @@
|
||||
BR2_CMAKE ?= cmake
|
||||
|
||||
ifneq (,$(call suitable-host-package,cmake,$(BR2_CMAKE)))
|
||||
USE_SYSTEM_CMAKE = YES
|
||||
else
|
||||
BR2_CMAKE = $(HOST_DIR)/usr/bin/cmake
|
||||
endif
|
||||
30
bsp/buildroot/support/dependencies/check-host-cmake.sh
Executable file
30
bsp/buildroot/support/dependencies/check-host-cmake.sh
Executable file
@@ -0,0 +1,30 @@
|
||||
#!/bin/sh
|
||||
|
||||
candidate="$1"
|
||||
|
||||
cmake=`which $candidate`
|
||||
if [ ! -x "$cmake" ]; then
|
||||
# echo nothing: no suitable cmake found
|
||||
exit 1
|
||||
fi
|
||||
|
||||
version=`$cmake --version | head -n1 | cut -d\ -f3`
|
||||
major=`echo "$version" | cut -d. -f1`
|
||||
minor=`echo "$version" | cut -d. -f2`
|
||||
|
||||
# Versions before 3.0 are affected by the bug described in
|
||||
# https://git.busybox.net/buildroot/commit/?id=ef2c1970e4bff3be3992014070392b0e6bc28bd2
|
||||
# and fixed in upstream CMake in version 3.0:
|
||||
# https://cmake.org/gitweb?p=cmake.git;h=e8b8b37ef6fef094940d3384df5a1d421b9fa568
|
||||
major_min=3
|
||||
minor_min=0
|
||||
if [ $major -gt $major_min ]; then
|
||||
echo $cmake
|
||||
else
|
||||
if [ $major -eq $major_min -a $minor -ge $minor_min ]; then
|
||||
echo $cmake
|
||||
else
|
||||
# echo nothing: no suitable cmake found
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
@@ -16,10 +16,6 @@ $(shell support/dependencies/check-host-$(1).sh $(2))
|
||||
endef
|
||||
-include $(sort $(wildcard support/dependencies/check-host-*.mk))
|
||||
|
||||
ifeq ($(BR2_STRIP_sstrip),y)
|
||||
DEPENDENCIES_HOST_PREREQ += host-sstrip
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_CCACHE),y)
|
||||
DEPENDENCIES_HOST_PREREQ += host-ccache
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user