From 5b57ae7ad197fd641c233f22d326c846b9ea2204 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 12 Dec 2017 12:21:51 +0100 Subject: [PATCH] Revert "package/cmake: bump version to 3.10.0 and add license hash" This reverts commit 65205c2425bccb7039ca0e2caffb7c64c26805f7, which causes too many build failures of host-cmake due to the use by CMake of the emplace_hint C++11 method. Fixes: http://autobuild.buildroot.net/results/90d38169b50c29842ecc1752c2abf66d4c2d9e63/ This new dependency of host-cmake will have to be taken care of in a more complete patch. Signed-off-by: Thomas Petazzoni --- package/cmake/cmake.hash | 5 ++--- package/cmake/cmake.mk | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index b095d722c6..f138ac79a1 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,3 +1,2 @@ -# From http://www.cmake.org/files/v3.10/cmake-3.10.0-SHA-256.txt -sha256 b3345c17609ea0f039960ef470aa099de9942135990930a57c14575aae884987 cmake-3.10.0.tar.gz -sha256 ccf2c6d4468919c8c26a764b9ed8fde349f0d298335524568b346b9bdcf56e1f Copyright.txt +# From http://www.cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt +sha256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d cmake-3.8.2.tar.gz diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 601bb43b6b..a00691a128 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.10 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0 +CMAKE_VERSION_MAJOR = 3.8 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt