diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-08-28 15:18:57 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-01 11:44:03 +0100 |
commit | eb45cd659bf06fdf1ba4c377db2aac268ecf6e31 (patch) | |
tree | e5b02323d41ba3b7c301c02b0ddc1471d218ec1a /meta/recipes-devtools | |
parent | bb72a8645a64d6b0f68e50d96d4bad648c806a9c (diff) | |
download | poky-eb45cd659bf06fdf1ba4c377db2aac268ecf6e31.tar.gz |
cmake: update to 3.3.1
Share tarball checksums between cmake and cmake-native via cmake.inc.
(From OE-Core rev: 8292eba3c79ffcdebd23cbabc9975c7a4075dba6)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-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.inc | 3 | ||||
-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 += "\ | |||
8 | file://cmlibarchive-disable-ext2fs.patch \ | 8 | file://cmlibarchive-disable-ext2fs.patch \ |
9 | " | 9 | " |
10 | 10 | ||
11 | SRC_URI[md5sum] = "2da57308071ea98b10253a87d2419281" | ||
12 | SRC_URI[sha256sum] = "ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78" | ||
13 | |||
14 | # Disable ccmake since we don't depend on ncurses | 11 | # Disable ccmake since we don't depend on ncurses |
15 | CMAKE_EXTRACONF = "\ | 12 | CMAKE_EXTRACONF = "\ |
16 | -DBUILD_CursesDialog=0 \ | 13 | -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 | |||
16 | file://qt4-fail-silent.patch \ | 16 | file://qt4-fail-silent.patch \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRC_URI[md5sum] = "52638576f4e1e621fed6c3410d3a1b12" | ||
20 | SRC_URI[sha256sum] = "cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6" | ||
21 | |||
19 | inherit autotools | 22 | inherit autotools |
20 | 23 | ||
21 | # Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable | 24 | # 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 = " \ | |||
8 | file://OEToolchainConfig.cmake \ | 8 | file://OEToolchainConfig.cmake \ |
9 | file://environment.d-cmake.sh" | 9 | file://environment.d-cmake.sh" |
10 | 10 | ||
11 | SRC_URI[md5sum] = "2da57308071ea98b10253a87d2419281" | ||
12 | SRC_URI[sha256sum] = "ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78" | ||
13 | |||
14 | # Strip ${prefix} from ${docdir}, set result into docdir_stripped | 11 | # Strip ${prefix} from ${docdir}, set result into docdir_stripped |
15 | python () { | 12 | python () { |
16 | prefix=d.getVar("prefix", True) | 13 | prefix=d.getVar("prefix", True) |