From 771d0877d6843c747878762319aa162ee3f863c7 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 13 Dec 2012 19:04:16 -0800 Subject: cmake: Update to 2.8.10.2 (From OE-Core rev: 4a407b927cca97c11f3211b384db920c17dd0c64) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../cmake/cmake-native_2.8.10.1.bb | 4 --- .../cmake/cmake-native_2.8.10.2.bb | 4 +++ meta/recipes-devtools/cmake/cmake.inc | 3 -- meta/recipes-devtools/cmake/cmake_2.8.10.1.bb | 37 -------------------- meta/recipes-devtools/cmake/cmake_2.8.10.2.bb | 40 ++++++++++++++++++++++ 5 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.10.1.bb create mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb delete mode 100644 meta/recipes-devtools/cmake/cmake_2.8.10.1.bb create mode 100644 meta/recipes-devtools/cmake/cmake_2.8.10.2.bb (limited to 'meta/recipes-devtools/cmake') 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 deleted file mode 100644 index ca81810..0000000 --- a/meta/recipes-devtools/cmake/cmake-native_2.8.10.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require cmake.inc -inherit native - -PR = "${INC_PR}.0" 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 new file mode 100644 index 0000000..ca81810 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb @@ -0,0 +1,4 @@ +require cmake.inc +inherit native + +PR = "${INC_PR}.0" diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 97059aa..6dc319c 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])}" 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_2.8.10.1.bb b/meta/recipes-devtools/cmake/cmake_2.8.10.1.bb deleted file mode 100644 index 9e1b802..0000000 --- a/meta/recipes-devtools/cmake/cmake_2.8.10.1.bb +++ /dev/null @@ -1,37 +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" - -# 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.10.2.bb b/meta/recipes-devtools/cmake/cmake_2.8.10.2.bb new file mode 100644 index 0000000..ce398dd --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake_2.8.10.2.bb @@ -0,0 +1,40 @@ +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" -- cgit v1.1