[Buildroot] [PATCH next v2] cmake: bump version to 3.7.0

[Buildroot] [PATCH next v2] cmake: bump version to 3.7.0

[Vicente Olivert Riera]

libuv is now a required dependency.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
Changes v1 -> v2:
 - Do not say that !BR2_STATIC_LIBS dependency is there only because libuv
---
 package/cmake/Config.in  | 9 +++++++--
 package/cmake/cmake.hash | 4 ++--
 package/cmake/cmake.mk   | 6 +++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/package/cmake/Config.in b/package/cmake/Config.in
index 6f04a4a..716d80e 100644
--- a/package/cmake/Config.in
+++ b/package/cmake/Config.in
@@ -20,11 +20,14 @@ config BR2_PACKAGE_CMAKE_CTEST
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_XZ
+	select BR2_PACKAGE_LIBUV
 	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 # libuv
+	depends on BR2_USE_MMU # libuv
 	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 +37,9 @@ 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, threads"
 	depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
+	depends on BR2_USE_MMU
 	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
diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash
index f846dc9..687e5a4 100644
--- a/package/cmake/cmake.hash
+++ b/package/cmake/cmake.hash
@@ -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.7/cmake-3.7.0-SHA-256.txt
+sha256 ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31  cmake-3.7.0.tar.gz
diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index fadb09e..522d7fe 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CMAKE_VERSION_MAJOR = 3.6
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3
+CMAKE_VERSION_MAJOR = 3.7
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0
 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
 CMAKE_LICENSE = BSD-3c
 CMAKE_LICENSE_FILES = Copyright.txt
@@ -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
 
 CMAKE_CONF_OPTS = \
 	-DKWSYS_LFS_WORKS=TRUE \
-- 
2.10.1

[Buildroot] [PATCH next v2] cmake: bump version to 3.7.0

[Thomas Petazzoni]

Samuel,

Since you are our CMake guy, could you please review/test this?

More specifically, I'm interested in understanding if there are some
potential compatibility issues with our packages that use a CMake-based
build system.

Thanks!

Thomas

On Mon, 14 Nov 2016 13:15:41 +0000, Vicente Olivert Riera wrote:
> libuv is now a required dependency.
> 
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
> Changes v1 -> v2:
>  - Do not say that !BR2_STATIC_LIBS dependency is there only because libuv
> ---
>  package/cmake/Config.in  | 9 +++++++--
>  package/cmake/cmake.hash | 4 ++--
>  package/cmake/cmake.mk   | 6 +++---
>  3 files changed, 12 insertions(+), 7 deletions(-)
> 
> diff --git a/package/cmake/Config.in b/package/cmake/Config.in
> index 6f04a4a..716d80e 100644
> --- a/package/cmake/Config.in
> +++ b/package/cmake/Config.in
> @@ -20,11 +20,14 @@ config BR2_PACKAGE_CMAKE_CTEST
>  	select BR2_PACKAGE_EXPAT
>  	select BR2_PACKAGE_BZIP2
>  	select BR2_PACKAGE_XZ
> +	select BR2_PACKAGE_LIBUV
>  	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 # libuv
> +	depends on BR2_USE_MMU # libuv
>  	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 +37,9 @@ 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, threads"
>  	depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
> +	depends on BR2_USE_MMU
>  	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
> diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash
> index f846dc9..687e5a4 100644
> --- a/package/cmake/cmake.hash
> +++ b/package/cmake/cmake.hash
> @@ -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.7/cmake-3.7.0-SHA-256.txt
> +sha256 ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31  cmake-3.7.0.tar.gz
> diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
> index fadb09e..522d7fe 100644
> --- a/package/cmake/cmake.mk
> +++ b/package/cmake/cmake.mk
> @@ -4,8 +4,8 @@
>  #
>  ################################################################################
>  
> -CMAKE_VERSION_MAJOR = 3.6
> -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3
> +CMAKE_VERSION_MAJOR = 3.7
> +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0
>  CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
>  CMAKE_LICENSE = BSD-3c
>  CMAKE_LICENSE_FILES = Copyright.txt
> @@ -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
>  
>  CMAKE_CONF_OPTS = \
>  	-DKWSYS_LFS_WORKS=TRUE \



-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[Buildroot] [PATCH next v2] cmake: bump version to 3.7.0

[Samuel Martin]

Hi all,

On Wed, Nov 16, 2016 at 12:02 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Samuel,
>
> Since you are our CMake guy, could you please review/test this?
>
> More specifically, I'm interested in understanding if there are some
> potential compatibility issues with our packages that use a CMake-based
> build system.
>

From the changelog, I see no harmful changes for Buildroot in this release.

I gave it a try on top of the next branch, with as many target cmake
package enabled as possible, and forcing buildroot to build
host-cmake.
I got no error related to cmake bump.

[Samuel Martin: tested on next branch]
Tested-by: Samuel Martin <s.martin49@gmail.com>

Regards,

-- 
Samuel

[Buildroot] [PATCH next v2] cmake: bump version to 3.7.0

[Thomas Petazzoni]

Hello,

On Mon, 14 Nov 2016 13:15:41 +0000, Vicente Olivert Riera wrote:
> libuv is now a required dependency.
> 
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
> Changes v1 -> v2:
>  - Do not say that !BR2_STATIC_LIBS dependency is there only because libuv
> ---
>  package/cmake/Config.in  | 9 +++++++--
>  package/cmake/cmake.hash | 4 ++--
>  package/cmake/cmake.mk   | 6 +++---
>  3 files changed, 12 insertions(+), 7 deletions(-)

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com