Rebase the patches due to macro name changes.
Signed-off-by: Saul Wold s...@linux.intel.com
---
.../cmake/cmake-native_2.8.10.1.bb |4 ++
meta/recipes-devtools/cmake/cmake-native_2.8.8.bb |8 ---
meta/recipes-devtools/cmake/cmake.inc |3 +
.../cmake/cmake/dont-run-cross-binaries.patch | 19
.../cmake/cmake/support-oe-qt4-tools-names.patch | 46 ++--
.../cmake/{cmake_2.8.8.bb = cmake_2.8.10.1.bb}|3 -
6 files changed, 40 insertions(+), 43 deletions(-)
create mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.10.1.bb
delete mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.8.bb
rename meta/recipes-devtools/cmake/{cmake_2.8.8.bb = cmake_2.8.10.1.bb} (88%)
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.10.1.bb
b/meta/recipes-devtools/cmake/cmake-native_2.8.10.1.bb
new file mode 100644
index 000..ca81810
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake-native_2.8.10.1.bb
@@ -0,0 +1,4 @@
+require cmake.inc
+inherit native
+
+PR = ${INC_PR}.0
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.8.bb
b/meta/recipes-devtools/cmake/cmake-native_2.8.8.bb
deleted file mode 100644
index 03d57d1..000
--- a/meta/recipes-devtools/cmake/cmake-native_2.8.8.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require cmake.inc
-inherit native
-
-PR = ${INC_PR}.0
-
-SRC_URI[md5sum] = ba74b22c788a0c8547976b880cd02b17
-SRC_URI[sha256sum] =
2b59897864d6220ff20aa8eac64cac8994e004898a1c0f899c8cb4d7b7570b46
-
diff --git a/meta/recipes-devtools/cmake/cmake.inc
b/meta/recipes-devtools/cmake/cmake.inc
index 6dc319c..97059aa 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -16,6 +16,9 @@ CMAKE_MAJOR_VERSION =
${@'.'.join(d.getVar('PV',1).split('.')[0:2])}
SRC_URI =
http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
file://support-oe-qt4-tools-names.patch
+SRC_URI[md5sum] = aabf16d8e957f99921a0095885381373
+SRC_URI[sha256sum] =
dbfb9d609e8fdb6f0947993246c11e2ee5d47944d6e7bd9314463b31e420e6e0
+
inherit autotools
do_configure () {
diff --git a/meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch
b/meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch
index 4eb1794..0c059f1 100644
--- a/meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch
+++ b/meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch
@@ -7,16 +7,17 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Otavio Salvador ota...@ossystems.com.br
-diff -ru cmake-2.8.2.orig/CMakeLists.txt cmake-2.8.2/CMakeLists.txt
cmake-2.8.2.orig/CMakeLists.txt2010-07-28 00:48:42.0 +0200
-+++ cmake-2.8.2/CMakeLists.txt 2010-07-28 01:05:17.0 +0200
-@@ -518,7 +518,8 @@
+Index: cmake-2.8.10.1/CMakeLists.txt
+===
+--- cmake-2.8.10.1.orig/CMakeLists.txt
cmake-2.8.10.1/CMakeLists.txt
+@@ -588,7 +588,8 @@ mark_as_advanced(CMAKE_STRICT)
# build the remaining subdirectories
- ADD_SUBDIRECTORY(Source)
--ADD_SUBDIRECTORY(Utilities)
+ add_subdirectory(Source)
+-add_subdirectory(Utilities)
+# Come on! Running the cross-binaries on host is not a good idea.
-+#ADD_SUBDIRECTORY(Utilities)
- ADD_SUBDIRECTORY(Tests)
++#add_subdirectory(Utilities)
+ add_subdirectory(Tests)
- # add a test
+ if(BUILD_TESTING)
diff --git a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
index 147c249..258971b 100644
--- a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
+++ b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
@@ -11,88 +11,88 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Otavio Salvador ota...@ossystems.com.br
-Index: cmake-2.8.5-rc3/Modules/FindQt4.cmake
+Index: cmake-2.8.10.1/Modules/FindQt4.cmake
===
cmake-2.8.5-rc3.orig/Modules/FindQt4.cmake 2011-06-27 14:41:05.0
+
-+++ cmake-2.8.5-rc3/Modules/FindQt4.cmake 2011-07-08 15:31:58.057170949
+
-@@ -473,7 +473,7 @@
+--- cmake-2.8.10.1.orig/Modules/FindQt4.cmake
cmake-2.8.10.1/Modules/FindQt4.cmake
+@@ -497,7 +497,7 @@ get_filename_component(qt_install_versio
# check for qmake
# Debian uses qmake-qt4
# macports' Qt uses qmake-mac
--FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
-+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake2 qmake4 qmake-qt4
qmake-mac PATHS
-
[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin
- [HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin
-
[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin
-@@ -944,13 +944,13 @@
- ENDIF(QT_QMAKE_CHANGED)
-
- FIND_PROGRAM(QT_MOC_EXECUTABLE
