diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-11-19 08:53:21 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-20 14:08:57 +0000 |
commit | cd9127664d77df995037bdcff53053835ef026ee (patch) | |
tree | fedd47ffaf40e782a4080812eafaee5c32f45855 /meta | |
parent | 45206510ab48bfee6e183f698f963fea8f03e2a5 (diff) | |
download | openembedded-core-cd9127664d77df995037bdcff53053835ef026ee.tar.gz openembedded-core-cd9127664d77df995037bdcff53053835ef026ee.tar.bz2 openembedded-core-cd9127664d77df995037bdcff53053835ef026ee.zip |
cmake: drop already applied patches
These patches were part of the 2.8.11 release.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch | 37 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch | 40 |
3 files changed, 0 insertions, 79 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 8592a23046..fb451fde6f 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])}" SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://support-oe-qt4-tools-names.patch \ - file://aarch64-cmake.patch \ - file://aarch64-kwsys.patch \ file://qt4-fail-silent.patch \ file://cmake-2.8.11.2-FindFreetype.patch \ " 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 3e26d58267..0000000000 --- a/meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Riku Voipio <riku.voipio@linaro.org> -Date: Fri, 21 Dec 2012 11:20:02 +0000 (+0200) -Subject: KWIML: Teach ABI.h about Aarch64 -X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=34916522 - -KWIML: Teach ABI.h about Aarch64 - -The __aarch64__ defines Aarch64, while __AARCH64EB__ defines bigendian -and __AARCH64EL__ little endian. Only little endian tested, no big -endian toolchain exists yet. - -Signed-off-by: Riku Voipio <riku.voipio@linaro.org> - -Hand edited by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> to get it applied in OE - -Upstream-Status: Backport ---- - -diff --git a/ABI.h.in b/ABI.h.in -index f93ddba..7f4772a 100644 ---- a/Utilities/KWIML/ABI.h.in -+++ b/Utilities/KWIML/ABI.h.in -@@ -418,6 +418,14 @@ suppression macro @KWIML@_ABI_NO_VERIFY was defined. - #elif defined(__vax__) - # define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG - -+/* Aarch64 */ -+#elif defined(__aarch64__) -+# if !defined(__AARCH64EB__) -+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_LITTLE -+# else -+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG -+# endif -+ - /* Unknown CPU */ - #elif !defined(@KWIML@_ABI_NO_ERROR_ENDIAN) - # 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 2b68eae6c2..0000000000 --- a/meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: KWSys Robot <kwrobot@kitware.com> -Date: Fri, 21 Dec 2012 13:29:37 +0000 (-0500) -Subject: KWSys 2012-12-21 (8ce09af5) -X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=567e7d94 - -KWSys 2012-12-21 (8ce09af5) - -Extract upstream KWSys using the following shell commands. - -$ git archive --prefix=upstream-kwsys/ 8ce09af5 | tar x -$ git shortlog --no-merges --abbrev=8 --format='%h %s' 933eb822..8ce09af5 -Riku Voipio (1): - 8ce09af5 CPU: Add Aarch64 support - -Change-Id: I4bd0a97abaa0f958e2679afe2d4ad4bcc37434a0 - -Hand edited by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> to get it applied in OE - -Upstream-Status: Backport ---- - -diff --git a/CPU.h.in b/CPU.h.in -index ecd29d1..2e1a584 100644 ---- a/Source/kwsys/CPU.h.in -+++ b/Source/kwsys/CPU.h.in -@@ -98,6 +98,14 @@ - #elif defined(__SYSC_ZARCH__) - # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG - -+/* Aarch64 */ -+#elif defined(__aarch64__) -+# if !defined(__AARCH64EB__) -+# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_LITTLE -+# else -+# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG -+# endif -+ - /* Unknown CPU */ - #else - # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID 0 |