From 7f7fb8be07f97224df1b287f4d21fb78551a4da3 Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Mon, 8 Jul 2013 17:19:59 -0700
Subject: cmake: Update to 2.8.11.2

(From OE-Core rev: 3a709c2d189a0fccf04ee0fabd21975d6886e734)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../cmake/cmake-native_2.8.11.1.bb                 |  5 ---
 .../cmake/cmake-native_2.8.11.2.bb                 |  5 +++
 meta/recipes-devtools/cmake/cmake_2.8.11.1.bb      | 38 --------------------
 meta/recipes-devtools/cmake/cmake_2.8.11.2.bb      | 41 ++++++++++++++++++++++
 4 files changed, 46 insertions(+), 43 deletions(-)
 delete mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.11.1.bb
 create mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.11.2.bb
 delete mode 100644 meta/recipes-devtools/cmake/cmake_2.8.11.1.bb
 create mode 100644 meta/recipes-devtools/cmake/cmake_2.8.11.2.bb

(limited to 'meta/recipes-devtools/cmake')

diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.11.1.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.11.1.bb
deleted file mode 100644
index 0a84d5b..0000000
--- a/meta/recipes-devtools/cmake/cmake-native_2.8.11.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require cmake.inc
-inherit native
-
-SRC_URI[md5sum] = "df5324a3b203373a9e0a04b924281a43"
-SRC_URI[sha256sum] = "b7dbb86824051319b8e082d2f892ebe6d5914b4dac9b9ef1aeac5e7ed054b0bf"
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.11.2.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.11.2.bb
new file mode 100644
index 0000000..ab31049
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake-native_2.8.11.2.bb
@@ -0,0 +1,5 @@
+require cmake.inc
+inherit native
+
+SRC_URI[md5sum] = "6f5d7b8e7534a5d9e1a7664ba63cf882"
+SRC_URI[sha256sum] = "b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562"
diff --git a/meta/recipes-devtools/cmake/cmake_2.8.11.1.bb b/meta/recipes-devtools/cmake/cmake_2.8.11.1.bb
deleted file mode 100644
index 968ac62..0000000
--- a/meta/recipes-devtools/cmake/cmake_2.8.11.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-require cmake.inc
-
-inherit cmake
-
-DEPENDS += "curl expat zlib libarchive ncurses"
-
-SRC_URI += "file://dont-run-cross-binaries.patch"
-
-SRC_URI[md5sum] = "df5324a3b203373a9e0a04b924281a43"
-SRC_URI[sha256sum] = "b7dbb86824051319b8e082d2f892ebe6d5914b4dac9b9ef1aeac5e7ed054b0bf"
-
-# Strip ${prefix} from ${docdir}, set result into docdir_stripped
-python () {
-    prefix=d.getVar("prefix", True)
-    docdir=d.getVar("docdir", True)
-
-    if not docdir.startswith(prefix):
-        raise bb.build.FuncFailed('docdir must contain prefix as its prefix')
-
-    docdir_stripped = docdir[len(prefix):]
-    if len(docdir_stripped) > 0 and docdir_stripped[0] == '/':
-        docdir_stripped = docdir_stripped[1:]
-
-    d.setVar("docdir_stripped", docdir_stripped)
-}
-
-EXTRA_OECMAKE=" \
-    -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \
-    -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
-    -DKWSYS_CHAR_IS_SIGNED=1 \
-    -DBUILD_CursesDialog=0 \
-    ${@base_contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \
-"
-
-FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}"
-FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}"
-
-BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-devtools/cmake/cmake_2.8.11.2.bb b/meta/recipes-devtools/cmake/cmake_2.8.11.2.bb
new file mode 100644
index 0000000..91e5411
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake_2.8.11.2.bb
@@ -0,0 +1,41 @@
+require cmake.inc
+
+inherit cmake
+
+DEPENDS += "curl expat zlib libarchive ncurses"
+
+SRC_URI += "file://dont-run-cross-binaries.patch"
+
+SRC_URI[md5sum] = "df5324a3b203373a9e0a04b924281a43"
+SRC_URI[sha256sum] = "b7dbb86824051319b8e082d2f892ebe6d5914b4dac9b9ef1aeac5e7ed054b0bf"
+
+SRC_URI[md5sum] = "6f5d7b8e7534a5d9e1a7664ba63cf882"
+SRC_URI[sha256sum] = "b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562"
+
+# Strip ${prefix} from ${docdir}, set result into docdir_stripped
+python () {
+    prefix=d.getVar("prefix", True)
+    docdir=d.getVar("docdir", True)
+
+    if not docdir.startswith(prefix):
+        raise bb.build.FuncFailed('docdir must contain prefix as its prefix')
+
+    docdir_stripped = docdir[len(prefix):]
+    if len(docdir_stripped) > 0 and docdir_stripped[0] == '/':
+        docdir_stripped = docdir_stripped[1:]
+
+    d.setVar("docdir_stripped", docdir_stripped)
+}
+
+EXTRA_OECMAKE=" \
+    -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \
+    -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
+    -DKWSYS_CHAR_IS_SIGNED=1 \
+    -DBUILD_CursesDialog=0 \
+    ${@base_contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \
+"
+
+FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}"
+FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}"
+
+BBCLASSEXTEND = "nativesdk"
-- 
cgit v1.1