From c38fe8e31d5c84e56f18a7c1b4709cc239e579d7 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 11 Nov 2013 13:59:09 +0000 Subject: cmake: upgrade to 2.8.12.1 Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- .../cmake/cmake-native_2.8.12.1.bb | 10 ++++++ meta/recipes-devtools/cmake/cmake-native_2.8.12.bb | 10 ------ meta/recipes-devtools/cmake/cmake_2.8.12.1.bb | 38 ++++++++++++++++++++++ meta/recipes-devtools/cmake/cmake_2.8.12.bb | 38 ---------------------- 4 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.12.1.bb delete mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.12.bb create mode 100644 meta/recipes-devtools/cmake/cmake_2.8.12.1.bb delete 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.12.1.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.12.1.bb new file mode 100644 index 0000000000..c8137958e5 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake-native_2.8.12.1.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] = "9d38cd4e2c94c3cea97d0e2924814acc" +SRC_URI[sha256sum] = "fa28c12791d64c36ba6b6cb062a4b4bd4223053f6b9ea501b1bdbdf4d5df3a67" diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.12.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.12.bb deleted file mode 100644 index 4ee9011d0b..0000000000 --- a/meta/recipes-devtools/cmake/cmake-native_2.8.12.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] = "105bc6d21cc2e9b6aff901e43c53afea" -SRC_URI[sha256sum] = "d885ba10b2406ede59aa31a928df33c9d67fc01433202f7dd586999cfd0e0287" diff --git a/meta/recipes-devtools/cmake/cmake_2.8.12.1.bb b/meta/recipes-devtools/cmake/cmake_2.8.12.1.bb new file mode 100644 index 0000000000..c220abad55 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake_2.8.12.1.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] = "9d38cd4e2c94c3cea97d0e2924814acc" +SRC_URI[sha256sum] = "fa28c12791d64c36ba6b6cb062a4b4bd4223053f6b9ea501b1bdbdf4d5df3a67" + +# 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 deleted file mode 100644 index ffd947fd31..0000000000 --- a/meta/recipes-devtools/cmake/cmake_2.8.12.bb +++ /dev/null @@ -1,38 +0,0 @@ -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