summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-11-19 08:53:21 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-20 14:09:02 (GMT)
commit0ed19834b27ebe2af8be3eb9bb68dd520056d9bf (patch)
tree47c3d25e8f74d809eeb30f23dcde981a8c28cf4d
parent4d6772706c6188be7157a5a1160e23ab8a0e313d (diff)
downloadpoky-0ed19834b27ebe2af8be3eb9bb68dd520056d9bf.tar.gz
cmake: drop already applied patches
These patches were part of the 2.8.11 release. (From OE-Core rev: cd9127664d77df995037bdcff53053835ef026ee) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc2
-rw-r--r--meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch37
-rw-r--r--meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch40
3 files changed, 0 insertions, 79 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 8592a23..fb451fd 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -13,8 +13,6 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}"
13 13
14SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ 14SRC_URI = "http://www.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://aarch64-cmake.patch \
17 file://aarch64-kwsys.patch \
18 file://qt4-fail-silent.patch \ 16 file://qt4-fail-silent.patch \
19 file://cmake-2.8.11.2-FindFreetype.patch \ 17 file://cmake-2.8.11.2-FindFreetype.patch \
20 " 18 "
diff --git a/meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch b/meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch
deleted file mode 100644
index 3e26d58..0000000
--- a/meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From: Riku Voipio <riku.voipio@linaro.org>
2Date: Fri, 21 Dec 2012 11:20:02 +0000 (+0200)
3Subject: KWIML: Teach ABI.h about Aarch64
4X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=34916522
5
6KWIML: Teach ABI.h about Aarch64
7
8The __aarch64__ defines Aarch64, while __AARCH64EB__ defines bigendian
9and __AARCH64EL__ little endian. Only little endian tested, no big
10endian toolchain exists yet.
11
12Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
13
14Hand edited by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> to get it applied in OE
15
16Upstream-Status: Backport
17---
18
19diff --git a/ABI.h.in b/ABI.h.in
20index f93ddba..7f4772a 100644
21--- a/Utilities/KWIML/ABI.h.in
22+++ b/Utilities/KWIML/ABI.h.in
23@@ -418,6 +418,14 @@ suppression macro @KWIML@_ABI_NO_VERIFY was defined.
24 #elif defined(__vax__)
25 # define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG
26
27+/* Aarch64 */
28+#elif defined(__aarch64__)
29+# if !defined(__AARCH64EB__)
30+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_LITTLE
31+# else
32+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG
33+# endif
34+
35 /* Unknown CPU */
36 #elif !defined(@KWIML@_ABI_NO_ERROR_ENDIAN)
37 # error "Byte order of target CPU unknown."
diff --git a/meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch b/meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch
deleted file mode 100644
index 2b68eae..0000000
--- a/meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From: KWSys Robot <kwrobot@kitware.com>
2Date: Fri, 21 Dec 2012 13:29:37 +0000 (-0500)
3Subject: KWSys 2012-12-21 (8ce09af5)
4X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=567e7d94
5
6KWSys 2012-12-21 (8ce09af5)
7
8Extract upstream KWSys using the following shell commands.
9
10$ git archive --prefix=upstream-kwsys/ 8ce09af5 | tar x
11$ git shortlog --no-merges --abbrev=8 --format='%h %s' 933eb822..8ce09af5
12Riku Voipio (1):
13 8ce09af5 CPU: Add Aarch64 support
14
15Change-Id: I4bd0a97abaa0f958e2679afe2d4ad4bcc37434a0
16
17Hand edited by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> to get it applied in OE
18
19Upstream-Status: Backport
20---
21
22diff --git a/CPU.h.in b/CPU.h.in
23index ecd29d1..2e1a584 100644
24--- a/Source/kwsys/CPU.h.in
25+++ b/Source/kwsys/CPU.h.in
26@@ -98,6 +98,14 @@
27 #elif defined(__SYSC_ZARCH__)
28 # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG
29
30+/* Aarch64 */
31+#elif defined(__aarch64__)
32+# if !defined(__AARCH64EB__)
33+# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_LITTLE
34+# else
35+# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG
36+# endif
37+
38 /* Unknown CPU */
39 #else
40 # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID 0