From 13399264e987b698b120688dc5018adb3fa8522d Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 20 May 2013 19:20:39 -0700 Subject: cmake: Update to 2.8.11 Rebased support-oe-qt4-tools-names as some of the changes where added in the upstream code. Signed-off-by: Saul Wold --- .../cmake/cmake-native_2.8.10.2.bb | 7 --- meta/recipes-devtools/cmake/cmake-native_2.8.11.bb | 5 ++ meta/recipes-devtools/cmake/cmake.inc | 2 - .../cmake/cmake/support-oe-qt4-tools-names.patch | 70 +++++----------------- meta/recipes-devtools/cmake/cmake_2.8.10.2.bb | 40 ------------- meta/recipes-devtools/cmake/cmake_2.8.11.bb | 38 ++++++++++++ 6 files changed, 57 insertions(+), 105 deletions(-) delete mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb create mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.11.bb delete mode 100644 meta/recipes-devtools/cmake/cmake_2.8.10.2.bb create mode 100644 meta/recipes-devtools/cmake/cmake_2.8.11.bb (limited to 'meta') diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb deleted file mode 100644 index 01860a745a..0000000000 --- a/meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require cmake.inc -inherit native - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "097278785da7182ec0aea8769d06860c" -SRC_URI[sha256sum] = "ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1" diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.11.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.11.bb new file mode 100644 index 0000000000..dfe103f4c0 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake-native_2.8.11.bb @@ -0,0 +1,5 @@ +require cmake.inc +inherit native + +SRC_URI[md5sum] = "be6008f2299613d23fe82ab53ef7472e" +SRC_URI[sha256sum] = "20d0d3661797fa82c19e7a75c7315c640e001cb3238331ca170bb0fae27feee5" diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index b2cba5e7e6..6144d51be4 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -9,8 +9,6 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://Copyright.txt;md5=bb2fa3a08736b842556f6171bb9e8ae1 \ file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2" -INC_PR = "r1" - 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 \ 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 258971b8a4..0e311f70e3 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,36 +11,20 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Otavio Salvador -Index: cmake-2.8.10.1/Modules/FindQt4.cmake +Index: cmake-2.8.11/Modules/FindQt4.cmake =================================================================== ---- 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 -+find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac - PATHS - ENV QTDIR - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]" -@@ -982,13 +982,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) - endif() +--- cmake-2.8.11.orig/Modules/FindQt4.cmake ++++ cmake-2.8.11/Modules/FindQt4.cmake +@@ -569,7 +569,7 @@ endfunction() - find_program(QT_MOC_EXECUTABLE -- NAMES moc-qt4 moc -+ NAMES moc-qt4 moc4 moc - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) + set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) - find_program(QT_UIC_EXECUTABLE -- NAMES uic-qt4 uic -+ NAMES uic-qt4 uic4 uic - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) -@@ -1000,49 +1000,49 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) +-set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac) ++set(_QT4_QMAKE_NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac) + _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) + + if (QT_QMAKE_EXECUTABLE AND QTVERSION) +@@ -1157,19 +1157,19 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) ) find_program(QT_RCC_EXECUTABLE @@ -59,42 +43,16 @@ Index: cmake-2.8.10.1/Modules/FindQt4.cmake find_program(QT_DBUSXML2CPP_EXECUTABLE - NAMES qdbusxml2cpp -+ NAMES qdbusxml2cpp4 qdbusxml2cpp - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - find_program(QT_LUPDATE_EXECUTABLE -- NAMES lupdate-qt4 lupdate -+ NAMES lupdate-qt4 lupdate4 lupdate ++ NAMES qdbusxml2cp4 qdbusxml2cpp PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH ) - - find_program(QT_LRELEASE_EXECUTABLE -- NAMES lrelease-qt4 lrelease -+ NAMES lrelease-qt4 lrelease4 lrelease - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH +@@ -1187,7 +1187,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) ) find_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE - NAMES qcollectiongenerator-qt4 qcollectiongenerator -+ NAMES qcollectiongenerator-qt4 qcollectiongenerator4 qcollectiongenerator - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - find_program(QT_DESIGNER_EXECUTABLE -- NAMES designer-qt4 designer -+ NAMES designer-qt4 designer4 designer - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - find_program(QT_LINGUIST_EXECUTABLE -- NAMES linguist-qt4 linguist -+ NAMES linguist-qt4 linguist4 linguist ++ NAMES qcollectiongenerator-qt4 qcollectiongenerator qcollectiongenerator4 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH ) diff --git a/meta/recipes-devtools/cmake/cmake_2.8.10.2.bb b/meta/recipes-devtools/cmake/cmake_2.8.10.2.bb deleted file mode 100644 index 65f75b4dca..0000000000 --- a/meta/recipes-devtools/cmake/cmake_2.8.10.2.bb +++ /dev/null @@ -1,40 +0,0 @@ -require cmake.inc - -inherit cmake - -DEPENDS += "curl expat zlib libarchive ncurses" - -PR = "${INC_PR}.0" - -SRC_URI += "file://dont-run-cross-binaries.patch" - -SRC_URI[md5sum] = "097278785da7182ec0aea8769d06860c" -SRC_URI[sha256sum] = "ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1" - -# 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.bb b/meta/recipes-devtools/cmake/cmake_2.8.11.bb new file mode 100644 index 0000000000..bc0715594c --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake_2.8.11.bb @@ -0,0 +1,38 @@ +require cmake.inc + +inherit cmake + +DEPENDS += "curl expat zlib libarchive ncurses" + +SRC_URI += "file://dont-run-cross-binaries.patch" + +SRC_URI[md5sum] = "be6008f2299613d23fe82ab53ef7472e" +SRC_URI[sha256sum] = "20d0d3661797fa82c19e7a75c7315c640e001cb3238331ca170bb0fae27feee5" + +# 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.2.3