diff options
| author | Maxin B. John <maxin.john@intel.com> | 2016-05-20 15:51:19 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-22 16:09:21 +0100 |
| commit | 05bce1fda9b24f939d211516ad73984ad29ba4df (patch) | |
| tree | 0f4bdfcb1cc71a6a566d5e17f8ae0ce5485cf18c /meta/recipes-devtools | |
| parent | f4232f796875b007a438eb75fe438db6aba30572 (diff) | |
| download | openembedded-core-05bce1fda9b24f939d211516ad73984ad29ba4df.tar.gz openembedded-core-05bce1fda9b24f939d211516ad73984ad29ba4df.tar.bz2 openembedded-core-05bce1fda9b24f939d211516ad73984ad29ba4df.zip | |
cmake: update to 3.5.2
Adjust LIC_FILES_CHKSUM due to changes in the Copyright date.
No change to the license text.
Remove the upstreamed patch:
1. 0001-Add-NIOS2-CPU-support.patch
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake-native_3.5.2.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.4.3.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 7 | ||||
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake/0001-Add-NIOS2-CPU-support.patch | 50 | ||||
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake_3.5.2.bb (renamed from meta/recipes-devtools/cmake/cmake_3.4.3.bb) | 0 |
4 files changed, 3 insertions, 54 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.4.3.bb b/meta/recipes-devtools/cmake/cmake-native_3.5.2.bb index cb4e749d7a..cb4e749d7a 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.4.3.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.5.2.bb diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 968d003b2d..4c1a4c7188 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -6,7 +6,7 @@ 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])}" @@ -14,11 +14,10 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).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] = "701386a1b5ec95f8d1075ecf96383e02" +SRC_URI[sha256sum] = "92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake/0001-Add-NIOS2-CPU-support.patch b/meta/recipes-devtools/cmake/cmake/0001-Add-NIOS2-CPU-support.patch deleted file mode 100644 index 6e0ab9fb75..0000000000 --- a/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/meta/recipes-devtools/cmake/cmake_3.4.3.bb b/meta/recipes-devtools/cmake/cmake_3.5.2.bb index 2f188f0712..2f188f0712 100644 --- a/meta/recipes-devtools/cmake/cmake_3.4.3.bb +++ b/meta/recipes-devtools/cmake/cmake_3.5.2.bb |