diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/cmake')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake-native_3.4.3.bb | 16 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake-native_3.6.1.bb | 36 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake.inc | 18 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/0001-Add-NIOS2-CPU-support.patch | 50 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake | 8 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake_3.6.1.bb (renamed from import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake_3.4.3.bb) | 11 |
6 files changed, 49 insertions, 90 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake-native_3.4.3.bb b/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake-native_3.4.3.bb deleted file mode 100644 index cb4e749d7..000000000 --- a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake-native_3.4.3.bb +++ /dev/null @@ -1,16 +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 \ -" - -# 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/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake-native_3.6.1.bb b/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake-native_3.6.1.bb new file mode 100644 index 000000000..aec0d64de --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake-native_3.6.1.bb @@ -0,0 +1,36 @@ +require cmake.inc +inherit native + +DEPENDS += "bzip2-replacement-native expat-native xz-native zlib-native curl-native" + +SRC_URI += "\ + file://cmlibarchive-disable-ext2fs.patch \ +" + +B = "${WORKDIR}/build" +do_configure[cleandirs] = "${B}" + +# Disable ccmake since we don't depend on ncurses +CMAKE_EXTRACONF = "\ + -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \ + -DBUILD_CursesDialog=0 \ + -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ + -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \ + -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \ + -DHAVE_SYS_ACL_H=0 \ +" + +do_configure () { + ${S}/configure --verbose --prefix=${prefix} -- ${CMAKE_EXTRACONF} +} + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +do_compile[progress] = "percent" diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake.inc b/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake.inc index 968d003b2..4fcb0b1ed 100644 --- a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake.inc +++ b/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake.inc @@ -6,24 +6,21 @@ HOMEPAGE = "http://www.cmake.org/" BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" SECTION = "console/utils" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://Copyright.txt;md5=3ba5a6c34481652ce573e5c4e1d707e4 \ +LIC_FILES_CHKSUM = "file://Copyright.txt;md5=052f86c15bbde68af55c7f7b340ab639 \ file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2" -CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}" +CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV', True).split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://support-oe-qt4-tools-names.patch \ file://qt4-fail-silent.patch \ - file://0001-Add-NIOS2-CPU-support.patch \ " -SRC_URI[md5sum] = "4cb3ff35b2472aae70f542116d616e63" -SRC_URI[sha256sum] = "b73f8c1029611df7ed81796bf5ca8ba0ef41c6761132340c73ffe42704f980fa" +SRC_URI[md5sum] = "d6dd661380adacdb12f41b926ec99545" +SRC_URI[sha256sum] = "28ee98ec40427d41a45673847db7a905b59ce9243bb866eaf59dce0f58aaef11" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" -inherit autotools - # Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable # and possibly missing qmake binary (qtbase-native can be removed from sysroot # e.g. in order to upgrade it, even when there is target qtbase) @@ -46,10 +43,3 @@ do_configure_prepend() { sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutogen/CMakeLists.txt sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/autorcc_depends/CMakeLists.txt } - -# Extra flags to pass to cmake invoked by bootstrap -CMAKE_EXTRACONF = "" - -do_configure () { - ${S}/configure --prefix=${prefix} -- ${CMAKE_EXTRACONF} -} diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/0001-Add-NIOS2-CPU-support.patch b/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/0001-Add-NIOS2-CPU-support.patch deleted file mode 100644 index 6e0ab9fb7..000000000 --- a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/0001-Add-NIOS2-CPU-support.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3f8c3d3011ea192da2c761560b615f55763715ef Mon Sep 17 00:00:00 2001 -From: Marek Vasut <marex@denx.de> -Date: Thu, 26 Nov 2015 21:31:04 +0100 -Subject: [PATCH] Add NIOS2 CPU support - -Add necessary bits to support the NIOS2 little-endian CPU. - -Signed-off-by: Marek Vasut <marex@denx.de> -Cc: Ley Foon Tan <lftan@altera.com> -Cc: Thomas Chou <thomas@wytron.com.tw> -Cc: Walter Goossens <waltergoossens@home.nl> -Upstream-Status: Submitted ---- - Source/kwsys/CPU.h.in | 4 ++++ - Utilities/KWIML/ABI.h.in | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/Source/kwsys/CPU.h.in b/Source/kwsys/CPU.h.in -index 884d71a..66ffbb1 100644 ---- a/Source/kwsys/CPU.h.in -+++ b/Source/kwsys/CPU.h.in -@@ -88,6 +88,10 @@ - #elif defined(__mips) || defined(__mips__) || defined(__MIPS__) - # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG - -+/* NIOS2 */ -+#elif defined(__NIOS2__) || defined(__NIOS2) || defined(__nios2__) -+# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_LITTLE -+ - /* OpenRISC 1000 */ - #elif defined(__or1k__) - # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG -diff --git a/Utilities/KWIML/ABI.h.in b/Utilities/KWIML/ABI.h.in -index 6300ada..87b6e96 100644 ---- a/Utilities/KWIML/ABI.h.in -+++ b/Utilities/KWIML/ABI.h.in -@@ -398,6 +398,10 @@ suppression macro @KWIML@_ABI_NO_VERIFY was defined. - #elif defined(__mips) || defined(__mips__) || defined(__MIPS__) - # define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG - -+/* NIOS2 */ -+#elif defined(__NIOS2__) || defined(__NIOS2) || defined(__nios2__) -+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_LITTLE -+ - /* OpenRISC 1000 */ - #elif defined(__or1k__) - # define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG --- -2.6.2 - diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake b/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake index 60014bbf2..6518408c7 100644 --- a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake +++ b/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake @@ -3,13 +3,17 @@ set( CMAKE_C_FLAGS $ENV{CFLAGS} CACHE STRING "" FORCE ) set( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE STRING "" FORCE ) set( CMAKE ASM_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE ) set( CMAKE_LDFLAGS_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE ) + set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} $ENV{OECORE_NATIVE_SYSROOT} ) set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER ) set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) +set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY ) -string(REGEX MATCH "sysroots/([a-zA-Z0-9]+)" CMAKE_SYSTEM_PROCESSOR $ENV{SDKTARGETSYSROOT}) -string(REGEX REPLACE "sysroots/" "" CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}) +# Set CMAKE_SYSTEM_PROCESSOR from the sysroot name (assuming processor-distro-os). +if ($ENV{SDKTARGETSYSROOT} MATCHES "/sysroots/([a-zA-Z0-9_-]+)-.+-.+") + set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_MATCH_1}) +endif() # Include the toolchain configuration subscripts file( GLOB toolchain_config_files "${CMAKE_TOOLCHAIN_FILE}.d/*.cmake" ) diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake_3.4.3.bb b/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake_3.6.1.bb index 2f188f071..850d6de23 100644 --- a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake_3.4.3.bb +++ b/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake_3.6.1.bb @@ -14,7 +14,7 @@ python () { docdir=d.getVar("docdir", True) if not docdir.startswith(prefix): - raise bb.build.FuncFailed('docdir must contain prefix as its prefix') + bb.fatal('docdir must contain prefix as its prefix') docdir_stripped = docdir[len(prefix):] if len(docdir_stripped) > 0 and docdir_stripped[0] == '/': @@ -25,13 +25,8 @@ python () { 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 \ + -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ -DKWSYS_CHAR_IS_SIGNED=1 \ -DBUILD_CursesDialog=0 \ ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \ |