[v2,2/2] cmake: bump version to 3.8.0

Submitted by Vicente Olivert Riera on April 19, 2017, 12:24 p.m.

Details

Message ID 20170419122411.53340-2-Vincent.Riera@imgtec.com
State Superseded
Headers show

Commit Message

Vicente Olivert Riera April 19, 2017, 12:24 p.m.
cmake depends on librhash, but host-cmake doesn't. This is because we
use the bundled dependencies for host-cmake but not for target.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
Changes v1 -> v2:
- Added explanation in the commit log about why rhash dependency is
  needed for cmake but not for host-cmake. (Arnout)
---
 package/cmake/Config.in  | 1 +
 package/cmake/cmake.hash | 4 ++--
 package/cmake/cmake.mk   | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

Comments

Thomas Petazzoni April 19, 2017, 12:36 p.m.
Hello,

On Wed, 19 Apr 2017 13:24:11 +0100, Vicente Olivert Riera wrote:
> cmake depends on librhash, but host-cmake doesn't. This is because we
> use the bundled dependencies for host-cmake but not for target.
> 
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

Thanks for this update. Did you test building a large number of
cmake-package packages of Buildroot with this new CMake version?

(Of course, to really test this, you need to uninstall your system-wide
CMake, or at least make Buildroot believe it's not
available/appropriate).

Thanks!

Thomas
Vicente Olivert Riera April 19, 2017, 1:13 p.m.
Hi Thomas,

On 19/04/17 13:36, Thomas Petazzoni wrote:
> Hello,
> 
> On Wed, 19 Apr 2017 13:24:11 +0100, Vicente Olivert Riera wrote:
>> cmake depends on librhash, but host-cmake doesn't. This is because we
>> use the bundled dependencies for host-cmake but not for target.
>>
>> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> 
> Thanks for this update. Did you test building a large number of
> cmake-package packages of Buildroot with this new CMake version?

yes, I've tested with some of them:

~/git-clones/buildroot-1/output/build $ find . -maxdepth 2 -type f -name
"CMakeLists.txt" | cut -d'/' -f2
libuci-49ec6efbdac4819033d34f08927d795f83a3932d
bullet-2.85.1
cannelloni-20160414
tinyxml2-3.0.0
rabbitmq-c-v0.8.0
host-cmake-3.8.0
libssh-0.7.3
librtlsdr-v0.5.3
ubus-34c6e818e431cc53478a0f7c7c1eca07d194d692
bctoolbox-0.4.0
taglib-1.11.1
jasper-2.0.12
yajl-2.1.0
cjson-v1.4.6
libiqrf-v0.1.2
yaml-cpp-0.5.2
libical-1.0.1
zlib-1.2.11
expat-2.2.0
cdrkit-1.1.11
libubox-723730214732862de7e892bae2f7a7889e66bf1b
uhttpd-a8bf9c00842224edb394e79909053f7628ee6a82
exiv2-0.25

> 
> (Of course, to really test this, you need to uninstall your system-wide
> CMake, or at least make Buildroot believe it's not
> available/appropriate).

$ cmake
bash: /usr/bin/cmake: No such file or directory

Regards,

Vincent

> 
> Thanks!
> 
> Thomas
>

Patch hide | download patch | download mbox

diff --git a/package/cmake/Config.in b/package/cmake/Config.in
index 2706db5..00b7d8a 100644
--- a/package/cmake/Config.in
+++ b/package/cmake/Config.in
@@ -21,6 +21,7 @@  config BR2_PACKAGE_CMAKE_CTEST
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_XZ
 	select BR2_PACKAGE_LIBUV
+	select BR2_PACKAGE_LIBRHASH
 	depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp
 	depends on BR2_USE_WCHAR # libarchive
diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash
index 13c0237..f16f876 100644
--- a/package/cmake/cmake.hash
+++ b/package/cmake/cmake.hash
@@ -1,2 +1,2 @@ 
-# From http://www.cmake.org/files/v3.7/cmake-3.7.2-SHA-256.txt
-sha256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0  cmake-3.7.2.tar.gz
+# From http://www.cmake.org/files/v3.8/cmake-3.8.0-SHA-256.txt
+sha256 cab99162e648257343a20f61bcd0b287f5e88e36fcb2f1d77959da60b7f35969  cmake-3.8.0.tar.gz
diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index d9eea32..2b4a512 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -4,8 +4,8 @@ 
 #
 ################################################################################
 
-CMAKE_VERSION_MAJOR = 3.7
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2
+CMAKE_VERSION_MAJOR = 3.8
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0
 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
 CMAKE_LICENSE = BSD-3-Clause
 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 libuv
+CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz libuv librhash
 
 CMAKE_CONF_OPTS = \
 	-DKWSYS_LFS_WORKS=TRUE \