summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-08-28 15:18:57 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-01 11:43:36 +0100
commit8292eba3c79ffcdebd23cbabc9975c7a4075dba6 (patch)
tree03cb5736ac96e4e5e6ce745e908d947899e70005
parent04288b352c8a09fa347d0fa11fbed73544a7eea3 (diff)
downloadopenembedded-core-8292eba3c79ffcdebd23cbabc9975c7a4075dba6.tar.gz
cmake: update to 3.3.1
Share tarball checksums between cmake and cmake-native via cmake.inc. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.3.1.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.2.2.bb)3
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc3
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.3.1.bb (renamed from meta/recipes-devtools/cmake/cmake_3.2.2.bb)3
3 files changed, 3 insertions, 6 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.2.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.3.1.bb
index 17e9e2c1c4..cb4e749d7a 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.2.2.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.3.1.bb
@@ -8,9 +8,6 @@ SRC_URI += "\
file://cmlibarchive-disable-ext2fs.patch \
"
-SRC_URI[md5sum] = "2da57308071ea98b10253a87d2419281"
-SRC_URI[sha256sum] = "ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78"
-
# Disable ccmake since we don't depend on ncurses
CMAKE_EXTRACONF = "\
-DBUILD_CursesDialog=0 \
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index d1cb7abe06..57e93ac070 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -16,6 +16,9 @@ SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz
file://qt4-fail-silent.patch \
"
+SRC_URI[md5sum] = "52638576f4e1e621fed6c3410d3a1b12"
+SRC_URI[sha256sum] = "cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6"
+
inherit autotools
# Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable
diff --git a/meta/recipes-devtools/cmake/cmake_3.2.2.bb b/meta/recipes-devtools/cmake/cmake_3.3.1.bb
index 4765f6c20c..2f188f0712 100644
--- a/meta/recipes-devtools/cmake/cmake_3.2.2.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.3.1.bb
@@ -8,9 +8,6 @@ SRC_URI_append_class-nativesdk = " \
file://OEToolchainConfig.cmake \
file://environment.d-cmake.sh"
-SRC_URI[md5sum] = "2da57308071ea98b10253a87d2419281"
-SRC_URI[sha256sum] = "ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78"
-
# Strip ${prefix} from ${docdir}, set result into docdir_stripped
python () {
prefix=d.getVar("prefix", True)