summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-05-20 15:51:19 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-22 16:11:13 +0100
commit2c1aa9c96070c437e3c4a7e2d0462dc7916afb9d (patch)
tree30f12e1c0ff6dd5c73382fc59e9cf7f221925dd6
parent9157c11d4680d1d3d3effb4ba2b8cd609d171f8f (diff)
downloadpoky-2c1aa9c96070c437e3c4a7e2d0462dc7916afb9d.tar.gz
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 (From OE-Core rev: 05bce1fda9b24f939d211516ad73984ad29ba4df) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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.inc7
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-Add-NIOS2-CPU-support.patch50
-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/"
6BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" 6BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php"
7SECTION = "console/utils" 7SECTION = "console/utils"
8LICENSE = "BSD" 8LICENSE = "BSD"
9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=3ba5a6c34481652ce573e5c4e1d707e4 \ 9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=052f86c15bbde68af55c7f7b340ab639 \
10 file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2" 10 file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2"
11 11
12CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}" 12CMAKE_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])}"
14SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ 14SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
15 file://support-oe-qt4-tools-names.patch \ 15 file://support-oe-qt4-tools-names.patch \
16 file://qt4-fail-silent.patch \ 16 file://qt4-fail-silent.patch \
17 file://0001-Add-NIOS2-CPU-support.patch \
18 " 17 "
19 18
20SRC_URI[md5sum] = "4cb3ff35b2472aae70f542116d616e63" 19SRC_URI[md5sum] = "701386a1b5ec95f8d1075ecf96383e02"
21SRC_URI[sha256sum] = "b73f8c1029611df7ed81796bf5ca8ba0ef41c6761132340c73ffe42704f980fa" 20SRC_URI[sha256sum] = "92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a"
22 21
23UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 22UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
24 23
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 @@
1From 3f8c3d3011ea192da2c761560b615f55763715ef Mon Sep 17 00:00:00 2001
2From: Marek Vasut <marex@denx.de>
3Date: Thu, 26 Nov 2015 21:31:04 +0100
4Subject: [PATCH] Add NIOS2 CPU support
5
6Add necessary bits to support the NIOS2 little-endian CPU.
7
8Signed-off-by: Marek Vasut <marex@denx.de>
9Cc: Ley Foon Tan <lftan@altera.com>
10Cc: Thomas Chou <thomas@wytron.com.tw>
11Cc: Walter Goossens <waltergoossens@home.nl>
12Upstream-Status: Submitted
13---
14 Source/kwsys/CPU.h.in | 4 ++++
15 Utilities/KWIML/ABI.h.in | 4 ++++
16 2 files changed, 8 insertions(+)
17
18diff --git a/Source/kwsys/CPU.h.in b/Source/kwsys/CPU.h.in
19index 884d71a..66ffbb1 100644
20--- a/Source/kwsys/CPU.h.in
21+++ b/Source/kwsys/CPU.h.in
22@@ -88,6 +88,10 @@
23 #elif defined(__mips) || defined(__mips__) || defined(__MIPS__)
24 # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG
25
26+/* NIOS2 */
27+#elif defined(__NIOS2__) || defined(__NIOS2) || defined(__nios2__)
28+# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_LITTLE
29+
30 /* OpenRISC 1000 */
31 #elif defined(__or1k__)
32 # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG
33diff --git a/Utilities/KWIML/ABI.h.in b/Utilities/KWIML/ABI.h.in
34index 6300ada..87b6e96 100644
35--- a/Utilities/KWIML/ABI.h.in
36+++ b/Utilities/KWIML/ABI.h.in
37@@ -398,6 +398,10 @@ suppression macro @KWIML@_ABI_NO_VERIFY was defined.
38 #elif defined(__mips) || defined(__mips__) || defined(__MIPS__)
39 # define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG
40
41+/* NIOS2 */
42+#elif defined(__NIOS2__) || defined(__NIOS2) || defined(__nios2__)
43+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_LITTLE
44+
45 /* OpenRISC 1000 */
46 #elif defined(__or1k__)
47 # define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG
48--
492.6.2
50
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