summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-11-16 19:59:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-03 14:32:47 +0000
commit7a697d070910dbe3289c001f0ea6e4059fd15f96 (patch)
treefcd15b7f6846f06acf7940b9b4ceef7d29fd5e3c
parentb19ac46bca9b137b33a527e88e02451739bdb690 (diff)
downloadpoky-7a697d070910dbe3289c001f0ea6e4059fd15f96.tar.gz
cmake: Update to 2.8.10.1
(From OE-Core rev: b109a6e33fc7748de65d1ff76528b302e7f92dd8) 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.1.bb4
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_2.8.8.bb8
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc3
-rw-r--r--meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch19
-rw-r--r--meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch46
-rw-r--r--meta/recipes-devtools/cmake/cmake_2.8.10.1.bb (renamed from meta/recipes-devtools/cmake/cmake_2.8.8.bb)3
6 files changed, 40 insertions, 43 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.1.bb
new file mode 100644
index 0000000000..ca818102bf
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake-native_2.8.10.1.bb
@@ -0,0 +1,4 @@
1require cmake.inc
2inherit native
3
4PR = "${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 03d57d111e..0000000000
--- a/meta/recipes-devtools/cmake/cmake-native_2.8.8.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require cmake.inc
2inherit native
3
4PR = "${INC_PR}.0"
5
6SRC_URI[md5sum] = "ba74b22c788a0c8547976b880cd02b17"
7SRC_URI[sha256sum] = "2b59897864d6220ff20aa8eac64cac8994e004898a1c0f899c8cb4d7b7570b46"
8
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 6dc319cb6c..97059aa59e 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])}"
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
19inherit autotools 22inherit autotools
20 23
21do_configure () { 24do_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 4eb1794e4e..0c059f12ed 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]
7 7
8Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 8Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
9 9
10diff -ru cmake-2.8.2.orig/CMakeLists.txt cmake-2.8.2/CMakeLists.txt 10Index: cmake-2.8.10.1/CMakeLists.txt
11--- cmake-2.8.2.orig/CMakeLists.txt 2010-07-28 00:48:42.000000000 +0200 11===================================================================
12+++ cmake-2.8.2/CMakeLists.txt 2010-07-28 01:05:17.000000000 +0200 12--- cmake-2.8.10.1.orig/CMakeLists.txt
13@@ -518,7 +518,8 @@ 13+++ cmake-2.8.10.1/CMakeLists.txt
14@@ -588,7 +588,8 @@ mark_as_advanced(CMAKE_STRICT)
14 15
15 # build the remaining subdirectories 16 # build the remaining subdirectories
16 ADD_SUBDIRECTORY(Source) 17 add_subdirectory(Source)
17-ADD_SUBDIRECTORY(Utilities) 18-add_subdirectory(Utilities)
18+# Come on! Running the cross-binaries on host is not a good idea. 19+# Come on! Running the cross-binaries on host is not a good idea.
19+#ADD_SUBDIRECTORY(Utilities) 20+#add_subdirectory(Utilities)
20 ADD_SUBDIRECTORY(Tests) 21 add_subdirectory(Tests)
21 22
22 # add a test 23 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 147c2498f8..258971b8a4 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]
11 11
12Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 12Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
13 13
14Index: cmake-2.8.5-rc3/Modules/FindQt4.cmake 14Index: cmake-2.8.10.1/Modules/FindQt4.cmake
15=================================================================== 15===================================================================
16--- cmake-2.8.5-rc3.orig/Modules/FindQt4.cmake 2011-06-27 14:41:05.000000000 +0000 16--- cmake-2.8.10.1.orig/Modules/FindQt4.cmake
17+++ cmake-2.8.5-rc3/Modules/FindQt4.cmake 2011-07-08 15:31:58.057170949 +0000 17+++ cmake-2.8.10.1/Modules/FindQt4.cmake
18@@ -473,7 +473,7 @@ 18@@ -497,7 +497,7 @@ get_filename_component(qt_install_versio
19 # check for qmake 19 # check for qmake
20 # Debian uses qmake-qt4 20 # Debian uses qmake-qt4
21 # macports' Qt uses qmake-mac 21 # macports' Qt uses qmake-mac
22-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS 22-find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
23+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac PATHS 23+find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac
24 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" 24 PATHS
25 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" 25 ENV QTDIR
26 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" 26 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
27@@ -944,13 +944,13 @@ 27@@ -982,13 +982,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
28 ENDIF(QT_QMAKE_CHANGED) 28 endif()
29 29
30 FIND_PROGRAM(QT_MOC_EXECUTABLE 30 find_program(QT_MOC_EXECUTABLE
31- NAMES moc-qt4 moc 31- NAMES moc-qt4 moc
32+ NAMES moc-qt4 moc4 moc 32+ NAMES moc-qt4 moc4 moc
33 PATHS ${QT_BINARY_DIR} 33 PATHS ${QT_BINARY_DIR}
34 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH 34 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
35 ) 35 )
36 36
37 FIND_PROGRAM(QT_UIC_EXECUTABLE 37 find_program(QT_UIC_EXECUTABLE
38- NAMES uic-qt4 uic 38- NAMES uic-qt4 uic
39+ NAMES uic-qt4 uic4 uic 39+ NAMES uic-qt4 uic4 uic
40 PATHS ${QT_BINARY_DIR} 40 PATHS ${QT_BINARY_DIR}
41 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH 41 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
42 ) 42 )
43@@ -962,49 +962,49 @@ 43@@ -1000,49 +1000,49 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
44 ) 44 )
45 45
46 FIND_PROGRAM(QT_RCC_EXECUTABLE 46 find_program(QT_RCC_EXECUTABLE
47- NAMES rcc 47- NAMES rcc
48+ NAMES rcc4 rcc 48+ NAMES rcc4 rcc
49 PATHS ${QT_BINARY_DIR} 49 PATHS ${QT_BINARY_DIR}
50 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH 50 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
51 ) 51 )
52 52
53 FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE 53 find_program(QT_DBUSCPP2XML_EXECUTABLE
54- NAMES qdbuscpp2xml 54- NAMES qdbuscpp2xml
55+ NAMES qdbuscpp2xml4 qdbuscpp2xml 55+ NAMES qdbuscpp2xml4 qdbuscpp2xml
56 PATHS ${QT_BINARY_DIR} 56 PATHS ${QT_BINARY_DIR}
57 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH 57 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
58 ) 58 )
59 59
60 FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE 60 find_program(QT_DBUSXML2CPP_EXECUTABLE
61- NAMES qdbusxml2cpp 61- NAMES qdbusxml2cpp
62+ NAMES qdbusxml2cpp4 qdbusxml2cpp 62+ NAMES qdbusxml2cpp4 qdbusxml2cpp
63 PATHS ${QT_BINARY_DIR} 63 PATHS ${QT_BINARY_DIR}
64 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH 64 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
65 ) 65 )
66 66
67 FIND_PROGRAM(QT_LUPDATE_EXECUTABLE 67 find_program(QT_LUPDATE_EXECUTABLE
68- NAMES lupdate-qt4 lupdate 68- NAMES lupdate-qt4 lupdate
69+ NAMES lupdate-qt4 lupdate4 lupdate 69+ NAMES lupdate-qt4 lupdate4 lupdate
70 PATHS ${QT_BINARY_DIR} 70 PATHS ${QT_BINARY_DIR}
71 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH 71 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
72 ) 72 )
73 73
74 FIND_PROGRAM(QT_LRELEASE_EXECUTABLE 74 find_program(QT_LRELEASE_EXECUTABLE
75- NAMES lrelease-qt4 lrelease 75- NAMES lrelease-qt4 lrelease
76+ NAMES lrelease-qt4 lrelease4 lrelease 76+ NAMES lrelease-qt4 lrelease4 lrelease
77 PATHS ${QT_BINARY_DIR} 77 PATHS ${QT_BINARY_DIR}
78 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH 78 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
79 ) 79 )
80 80
81 FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE 81 find_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE
82- NAMES qcollectiongenerator-qt4 qcollectiongenerator 82- NAMES qcollectiongenerator-qt4 qcollectiongenerator
83+ NAMES qcollectiongenerator-qt4 qcollectiongenerator4 qcollectiongenerator 83+ NAMES qcollectiongenerator-qt4 qcollectiongenerator4 qcollectiongenerator
84 PATHS ${QT_BINARY_DIR} 84 PATHS ${QT_BINARY_DIR}
85 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH 85 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
86 ) 86 )
87 87
88 FIND_PROGRAM(QT_DESIGNER_EXECUTABLE 88 find_program(QT_DESIGNER_EXECUTABLE
89- NAMES designer-qt4 designer 89- NAMES designer-qt4 designer
90+ NAMES designer-qt4 designer4 designer 90+ NAMES designer-qt4 designer4 designer
91 PATHS ${QT_BINARY_DIR} 91 PATHS ${QT_BINARY_DIR}
92 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH 92 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
93 ) 93 )
94 94
95 FIND_PROGRAM(QT_LINGUIST_EXECUTABLE 95 find_program(QT_LINGUIST_EXECUTABLE
96- NAMES linguist-qt4 linguist 96- NAMES linguist-qt4 linguist
97+ NAMES linguist-qt4 linguist4 linguist 97+ NAMES linguist-qt4 linguist4 linguist
98 PATHS ${QT_BINARY_DIR} 98 PATHS ${QT_BINARY_DIR}
diff --git a/meta/recipes-devtools/cmake/cmake_2.8.8.bb b/meta/recipes-devtools/cmake/cmake_2.8.10.1.bb
index 8665dc3c6f..9e1b802053 100644
--- a/meta/recipes-devtools/cmake/cmake_2.8.8.bb
+++ b/meta/recipes-devtools/cmake/cmake_2.8.10.1.bb
@@ -8,9 +8,6 @@ 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] = "ba74b22c788a0c8547976b880cd02b17"
12SRC_URI[sha256sum] = "2b59897864d6220ff20aa8eac64cac8994e004898a1c0f899c8cb4d7b7570b46"
13
14# Strip ${prefix} from ${docdir}, set result into docdir_stripped 11# Strip ${prefix} from ${docdir}, set result into docdir_stripped
15python () { 12python () {
16 prefix=d.getVar("prefix", True) 13 prefix=d.getVar("prefix", True)