From 5d63ad569d6beab5beea82aa51c1625d0e1e8231 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 28 Oct 2013 16:44:40 +0000 Subject: cmake: upgrade to 2.8.12 Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- .../cmake/cmake-native_2.8.11.2.bb | 10 ------ meta/recipes-devtools/cmake/cmake-native_2.8.12.bb | 10 ++++++ meta/recipes-devtools/cmake/cmake_2.8.11.2.bb | 41 ---------------------- meta/recipes-devtools/cmake/cmake_2.8.12.bb | 38 ++++++++++++++++++++ 4 files changed, 48 insertions(+), 51 deletions(-) delete mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.11.2.bb create mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.12.bb delete mode 100644 meta/recipes-devtools/cmake/cmake_2.8.11.2.bb create mode 100644 meta/recipes-devtools/cmake/cmake_2.8.12.bb (limited to 'meta/recipes-devtools/cmake') 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 deleted file mode 100644 index e2a157b132..0000000000 --- a/meta/recipes-devtools/cmake/cmake-native_2.8.11.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -require cmake.inc -inherit native - -# Using cmake's internal libarchive, so some dependencies are needed -DEPENDS += "bzip2-native zlib-native" - -SRC_URI += "file://cmlibarchive-disable-ext2fs.patch" - -SRC_URI[md5sum] = "6f5d7b8e7534a5d9e1a7664ba63cf882" -SRC_URI[sha256sum] = "b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562" diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.12.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.12.bb new file mode 100644 index 0000000000..4ee9011d0b --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake-native_2.8.12.bb @@ -0,0 +1,10 @@ +require cmake.inc +inherit native + +# Using cmake's internal libarchive, so some dependencies are needed +DEPENDS += "bzip2-native zlib-native" + +SRC_URI += "file://cmlibarchive-disable-ext2fs.patch" + +SRC_URI[md5sum] = "105bc6d21cc2e9b6aff901e43c53afea" +SRC_URI[sha256sum] = "d885ba10b2406ede59aa31a928df33c9d67fc01433202f7dd586999cfd0e0287" diff --git a/meta/recipes-devtools/cmake/cmake_2.8.11.2.bb b/meta/recipes-devtools/cmake/cmake_2.8.11.2.bb deleted file mode 100644 index 91e5411218..0000000000 --- a/meta/recipes-devtools/cmake/cmake_2.8.11.2.bb +++ /dev/null @@ -1,41 +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" - -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" diff --git a/meta/recipes-devtools/cmake/cmake_2.8.12.bb b/meta/recipes-devtools/cmake/cmake_2.8.12.bb new file mode 100644 index 0000000000..ffd947fd31 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake_2.8.12.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] = "105bc6d21cc2e9b6aff901e43c53afea" +SRC_URI[sha256sum] = "d885ba10b2406ede59aa31a928df33c9d67fc01433202f7dd586999cfd0e0287" + +# 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 1.2.3-korg