Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -12,6 +12,14 @@ config BR2_PACKAGE_CMAKE
|
||||
|
||||
config BR2_PACKAGE_CMAKE_CTEST
|
||||
bool "ctest"
|
||||
depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp
|
||||
depends on BR2_USE_WCHAR # libarchive
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
|
||||
depends on BR2_USE_MMU # libuv
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
|
||||
select BR2_PACKAGE_CMAKE
|
||||
select BR2_PACKAGE_ZLIB
|
||||
select BR2_PACKAGE_JSONCPP
|
||||
@@ -20,11 +28,8 @@ config BR2_PACKAGE_CMAKE_CTEST
|
||||
select BR2_PACKAGE_EXPAT
|
||||
select BR2_PACKAGE_BZIP2
|
||||
select BR2_PACKAGE_XZ
|
||||
depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp
|
||||
depends on BR2_USE_WCHAR # libarchive
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_STATIC_LIBS
|
||||
select BR2_PACKAGE_LIBUV
|
||||
select BR2_PACKAGE_RHASH
|
||||
help
|
||||
CTest is a testing tool distributed as a part of CMake. It
|
||||
can be used to automate updating (using CVS for example),
|
||||
@@ -34,7 +39,10 @@ config BR2_PACKAGE_CMAKE_CTEST
|
||||
|
||||
http://www.cmake.org/
|
||||
|
||||
comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7"
|
||||
comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, NPTL"
|
||||
depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
|
||||
BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
|
||||
BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
|
||||
11
bsp/buildroot/package/cmake/Config.in.host
Normal file
11
bsp/buildroot/package/cmake/Config.in.host
Normal file
@@ -0,0 +1,11 @@
|
||||
config BR2_PACKAGE_HOST_CMAKE
|
||||
bool "host cmake"
|
||||
help
|
||||
CMake is an open-source, cross-platform family of tools
|
||||
designed to build, test and package software. CMake is used
|
||||
to control the software compilation process using simple
|
||||
platform and compiler independent configuration files, and
|
||||
generate native makefiles and workspaces that can be used in
|
||||
the compiler environment of your choice.
|
||||
|
||||
http://www.cmake.org/
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://www.cmake.org/files/v3.6/cmake-3.6.3-SHA-256.txt
|
||||
sha256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe cmake-3.6.3.tar.gz
|
||||
# From http://www.cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt
|
||||
sha256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d cmake-3.8.2.tar.gz
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CMAKE_VERSION_MAJOR = 3.6
|
||||
CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3
|
||||
CMAKE_VERSION_MAJOR = 3.8
|
||||
CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2
|
||||
CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
|
||||
CMAKE_LICENSE = BSD-3c
|
||||
CMAKE_LICENSE = BSD-3-Clause
|
||||
CMAKE_LICENSE_FILES = Copyright.txt
|
||||
|
||||
# CMake is a particular package:
|
||||
@@ -22,7 +22,7 @@ CMAKE_LICENSE_FILES = Copyright.txt
|
||||
# the system-wide libraries instead of rebuilding and statically
|
||||
# linking with the ones bundled into the CMake sources.
|
||||
|
||||
CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz
|
||||
CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz libuv rhash
|
||||
|
||||
CMAKE_CONF_OPTS = \
|
||||
-DKWSYS_LFS_WORKS=TRUE \
|
||||
@@ -32,7 +32,7 @@ CMAKE_CONF_OPTS = \
|
||||
-DBUILD_CursesDialog=OFF
|
||||
|
||||
# Get rid of -I* options from $(HOST_CPPFLAGS) to prevent that a
|
||||
# header available in $(HOST_DIR)/usr/include is used instead of a
|
||||
# header available in $(HOST_DIR)/include is used instead of a
|
||||
# CMake internal header, e.g. lzma* headers of the xz package
|
||||
HOST_CMAKE_CFLAGS = $(shell echo $(HOST_CFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%")
|
||||
HOST_CMAKE_CXXFLAGS = $(shell echo $(HOST_CXXFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%")
|
||||
@@ -41,7 +41,7 @@ define HOST_CMAKE_CONFIGURE_CMDS
|
||||
(cd $(@D); \
|
||||
$(HOST_CONFIGURE_OPTS) \
|
||||
CFLAGS="$(HOST_CMAKE_CFLAGS)" \
|
||||
./bootstrap --prefix=$(HOST_DIR)/usr \
|
||||
./bootstrap --prefix=$(HOST_DIR) \
|
||||
--parallel=$(PARALLEL_JOBS) -- \
|
||||
-DCMAKE_C_FLAGS="$(HOST_CMAKE_CFLAGS)" \
|
||||
-DCMAKE_CXX_FLAGS="$(HOST_CMAKE_CXXFLAGS)" \
|
||||
|
||||
Reference in New Issue
Block a user