summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-12-13 19:04:16 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-19 17:55:06 +0000
commit771d0877d6843c747878762319aa162ee3f863c7 (patch)
treea2867bbb8de5908d37ba462855b089121bb00bd9
parent02491b4eded7be406a64d8e55bd23f11643283fc (diff)
downloadpoky-771d0877d6843c747878762319aa162ee3f863c7.tar.gz
cmake: Update to 2.8.10.2
(From OE-Core rev: 4a407b927cca97c11f3211b384db920c17dd0c64) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb (renamed from meta/recipes-devtools/cmake/cmake-native_2.8.10.1.bb)0
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc3
-rw-r--r--meta/recipes-devtools/cmake/cmake_2.8.10.2.bb (renamed from meta/recipes-devtools/cmake/cmake_2.8.10.1.bb)3
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.10.1.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb
index ca818102bf..ca818102bf 100644
--- a/meta/recipes-devtools/cmake/cmake-native_2.8.10.1.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 97059aa59e..6dc319cb6c 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -16,9 +16,6 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}"
16SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ 16SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
17 file://support-oe-qt4-tools-names.patch" 17 file://support-oe-qt4-tools-names.patch"
18 18
19SRC_URI[md5sum] = "aabf16d8e957f99921a0095885381373"
20SRC_URI[sha256sum] = "dbfb9d609e8fdb6f0947993246c11e2ee5d47944d6e7bd9314463b31e420e6e0"
21
22inherit autotools 19inherit autotools
23 20
24do_configure () { 21do_configure () {
diff --git a/meta/recipes-devtools/cmake/cmake_2.8.10.1.bb b/meta/recipes-devtools/cmake/cmake_2.8.10.2.bb
index 9e1b802053..ce398ddc1b 100644
--- a/meta/recipes-devtools/cmake/cmake_2.8.10.1.bb
+++ b/meta/recipes-devtools/cmake/cmake_2.8.10.2.bb
@@ -8,6 +8,9 @@ PR = "${INC_PR}.0"
8 8
9SRC_URI += "file://dont-run-cross-binaries.patch" 9SRC_URI += "file://dont-run-cross-binaries.patch"
10 10
11SRC_URI[md5sum] = "097278785da7182ec0aea8769d06860c"
12SRC_URI[sha256sum] = "ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1"
13
11# Strip ${prefix} from ${docdir}, set result into docdir_stripped 14# Strip ${prefix} from ${docdir}, set result into docdir_stripped
12python () { 15python () {
13 prefix=d.getVar("prefix", True) 16 prefix=d.getVar("prefix", True)