aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen.kooi@linaro.org>2015-03-09 10:41:54 +0100
committerKoen Kooi <koen.kooi@linaro.org>2015-03-09 10:41:54 +0100
commit3da9c8045ba03116026689a087cd5acf3328f33d (patch)
treefcef750343c24bd411e32b50a14a52dd1a73b9e5
parentf52378a39bc12cffc9c7564af2d51fd501b85394 (diff)
downloadmeta-linaro-3da9c8045ba03116026689a087cd5acf3328f33d.tar.gz
qt4: drop bbappend
OE-core has better aarch64 patches for qt nowadays. Change-Id: Iee3aefaacbbc6efd979066d0a1cc68da761c8a1c Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
-rw-r--r--meta-aarch64/recipes-qt/qt4/files/aarch64.patch39
-rw-r--r--meta-aarch64/recipes-qt/qt4/qt4-x11-free_4.8.6.bbappend5
2 files changed, 0 insertions, 44 deletions
diff --git a/meta-aarch64/recipes-qt/qt4/files/aarch64.patch b/meta-aarch64/recipes-qt/qt4/files/aarch64.patch
deleted file mode 100644
index 2c970fe0..00000000
--- a/meta-aarch64/recipes-qt/qt4/files/aarch64.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d780ac54b5dd1cf45eb59103f014f811c407d38c Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sun, 10 Aug 2014 10:35:33 +0200
-Subject: [PATCH] JavaScriptCore: add Aarch64 support
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
-index e8b03be..01a839f 100644
---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
-+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
-@@ -373,6 +373,11 @@
- #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
- #endif
-
-+/* CPU(AARCH64) - Aarch64 */
-+#if defined(__aarch64__)
-+#define WTF_CPU_AARCH64 1
-+#endif
-+
- /* ==== OS() - underlying operating system; only to be used for mandated low-level services like
- virtual memory, not to choose a GUI toolkit ==== */
-
-@@ -1003,7 +1008,8 @@
- || CPU(SPARC64) \
- || CPU(S390X) \
- || CPU(PPC64) \
-- || CPU(MIPS64)
-+ || CPU(MIPS64) \
-+ || CPU(AARCH64)
- #define WTF_USE_JSVALUE64 1
- #else
- #define WTF_USE_JSVALUE32_64 1
---
-1.9.0
-
diff --git a/meta-aarch64/recipes-qt/qt4/qt4-x11-free_4.8.6.bbappend b/meta-aarch64/recipes-qt/qt4/qt4-x11-free_4.8.6.bbappend
deleted file mode 100644
index d9691430..00000000
--- a/meta-aarch64/recipes-qt/qt4/qt4-x11-free_4.8.6.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI_append = " \
- file://aarch64.patch \
-"