From eb45cd659bf06fdf1ba4c377db2aac268ecf6e31 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 28 Aug 2015 15:18:57 +0300 Subject: cmake: update to 3.3.1 Share tarball checksums between cmake and cmake-native via cmake.inc. (From OE-Core rev: 8292eba3c79ffcdebd23cbabc9975c7a4075dba6) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/cmake/cmake-native_3.2.2.bb | 19 -------- meta/recipes-devtools/cmake/cmake-native_3.3.1.bb | 16 +++++++ meta/recipes-devtools/cmake/cmake.inc | 3 ++ meta/recipes-devtools/cmake/cmake_3.2.2.bb | 56 ----------------------- meta/recipes-devtools/cmake/cmake_3.3.1.bb | 53 +++++++++++++++++++++ 5 files changed, 72 insertions(+), 75 deletions(-) delete mode 100644 meta/recipes-devtools/cmake/cmake-native_3.2.2.bb create mode 100644 meta/recipes-devtools/cmake/cmake-native_3.3.1.bb delete mode 100644 meta/recipes-devtools/cmake/cmake_3.2.2.bb create mode 100644 meta/recipes-devtools/cmake/cmake_3.3.1.bb diff --git a/meta/recipes-devtools/cmake/cmake-native_3.2.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.2.2.bb deleted file mode 100644 index 17e9e2c1c4..0000000000 --- a/meta/recipes-devtools/cmake/cmake-native_3.2.2.bb +++ /dev/null @@ -1,19 +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] = "2da57308071ea98b10253a87d2419281" -SRC_URI[sha256sum] = "ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78" - -# Disable ccmake since we don't depend on ncurses -CMAKE_EXTRACONF = "\ - -DBUILD_CursesDialog=0 \ - -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \ - -DHAVE_SYS_ACL_H=0 \ -" diff --git a/meta/recipes-devtools/cmake/cmake-native_3.3.1.bb b/meta/recipes-devtools/cmake/cmake-native_3.3.1.bb new file mode 100644 index 0000000000..cb4e749d7a --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake-native_3.3.1.bb @@ -0,0 +1,16 @@ +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 \ +" + +# Disable ccmake since we don't depend on ncurses +CMAKE_EXTRACONF = "\ + -DBUILD_CursesDialog=0 \ + -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \ + -DHAVE_SYS_ACL_H=0 \ +" diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index d1cb7abe06..57e93ac070 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -16,6 +16,9 @@ SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz file://qt4-fail-silent.patch \ " +SRC_URI[md5sum] = "52638576f4e1e621fed6c3410d3a1b12" +SRC_URI[sha256sum] = "cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6" + inherit autotools # Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable diff --git a/meta/recipes-devtools/cmake/cmake_3.2.2.bb b/meta/recipes-devtools/cmake/cmake_3.2.2.bb deleted file mode 100644 index 4765f6c20c..0000000000 --- a/meta/recipes-devtools/cmake/cmake_3.2.2.bb +++ /dev/null @@ -1,56 +0,0 @@ -require cmake.inc - -inherit cmake - -DEPENDS += "curl expat zlib libarchive xz ncurses bzip2" - -SRC_URI_append_class-nativesdk = " \ - file://OEToolchainConfig.cmake \ - file://environment.d-cmake.sh" - -SRC_URI[md5sum] = "2da57308071ea98b10253a87d2419281" -SRC_URI[sha256sum] = "ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78" - -# 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_LIBRARY_BZIP2=1 \ - -DCMAKE_USE_SYSTEM_LIBRARY_CURL=1 \ - -DCMAKE_USE_SYSTEM_LIBRARY_EXPAT=1 \ - -DCMAKE_USE_SYSTEM_LIBRARY_FORM=1 \ - -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=1 \ - -DCMAKE_USE_SYSTEM_LIBRARY_LIBLZMA=1 \ - -DCMAKE_USE_SYSTEM_LIBRARY_ZLIB=1 \ - -DKWSYS_CHAR_IS_SIGNED=1 \ - -DBUILD_CursesDialog=0 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \ -" - -do_install_append_class-nativesdk() { - mkdir -p ${D}${datadir}/cmake - install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ - - mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d - install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake.sh -} - -FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}" - -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_3.3.1.bb b/meta/recipes-devtools/cmake/cmake_3.3.1.bb new file mode 100644 index 0000000000..2f188f0712 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake_3.3.1.bb @@ -0,0 +1,53 @@ +require cmake.inc + +inherit cmake + +DEPENDS += "curl expat zlib libarchive xz ncurses bzip2" + +SRC_URI_append_class-nativesdk = " \ + file://OEToolchainConfig.cmake \ + file://environment.d-cmake.sh" + +# 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_LIBRARY_BZIP2=1 \ + -DCMAKE_USE_SYSTEM_LIBRARY_CURL=1 \ + -DCMAKE_USE_SYSTEM_LIBRARY_EXPAT=1 \ + -DCMAKE_USE_SYSTEM_LIBRARY_FORM=1 \ + -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=1 \ + -DCMAKE_USE_SYSTEM_LIBRARY_LIBLZMA=1 \ + -DCMAKE_USE_SYSTEM_LIBRARY_ZLIB=1 \ + -DKWSYS_CHAR_IS_SIGNED=1 \ + -DBUILD_CursesDialog=0 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \ +" + +do_install_append_class-nativesdk() { + mkdir -p ${D}${datadir}/cmake + install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ + + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d + install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake.sh +} + +FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}" + +FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}" +FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}" + +BBCLASSEXTEND = "nativesdk" -- cgit v1.2.3-54-g00ecf