diff options
author | Kai Kang <kai.kang@windriver.com> | 2014-09-12 19:03:38 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-23 10:18:18 +0000 |
commit | fbfabde9d53a930628c84d5bac1a8152350168e1 (patch) | |
tree | c4b5d9fc9f2655b8ee2bbc60d88f0b4241945fa1 /meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch | |
parent | 5b3107af9e7cca48f466294f9c450a6c8bba29a7 (diff) | |
download | poky-fbfabde9d53a930628c84d5bac1a8152350168e1.tar.gz |
qt4: add aarch64 support
Add aarch64 support for qt4 packages.
Most of the patches are derived from debian:
http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/tree/debian/patches
Add arch check to set right QT_ARCH.
Disable webkit temporarily for qt4 and qt4-embedded that they fail to build:
| runtime/JSValueInlineMethods.h: In constructor
'JSC::JSValue::JSValue(const JSC::JSCell*)':
| runtime/JSValueInlineMethods.h:242:78: error: cast from 'JSC::JSCell*'
to 'int32_t {aka int}' loses precision [-fpermissive]
It has been fix by Qt5, but didn't backport to Qt4. There is an still open
defect for it:
https://bugreports.qt-project.org/browse/QTBUG-35442
(From OE-Core rev: 886e0d43f2a543a13ac8e3f1cb570ecae90339e0)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch new file mode 100644 index 0000000000..fbd32b173d --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | From 800abbba658203fc8e746e3fc780a297cd4110cf Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= | ||
3 | <perezmeyer@gmail.com> | ||
4 | Date: Wed, 20 Aug 2014 17:52:49 -0300 | ||
5 | Subject: [PATCH] Fix AArch64/arm64 detection. | ||
6 | |||
7 | The detection needs to go before arm, else the system will detect AArch64/arm64 | ||
8 | as arm. | ||
9 | |||
10 | This patch comes from Wookey, he has agreed to put it under BSD or Expat | ||
11 | to allow it's inclusion in here: | ||
12 | <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#255> | ||
13 | |||
14 | Change-Id: Ic2171c03fca8bb871347940fa3a2bc467776f797 | ||
15 | |||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
20 | --- | ||
21 | configure | 12 ++++++------ | ||
22 | 1 file changed, 6 insertions(+), 6 deletions(-) | ||
23 | |||
24 | diff --git a/configure b/configure | ||
25 | index a9ba7c8..eb88b72 100755 | ||
26 | --- a/configure | ||
27 | +++ b/configure | ||
28 | @@ -3241,17 +3241,17 @@ if [ -z "${CFG_HOST_ARCH}" ]; then | ||
29 | fi | ||
30 | CFG_HOST_ARCH=s390 | ||
31 | ;; | ||
32 | - *:*:arm*) | ||
33 | + *:*:aarch64*|*:*:arm64*) | ||
34 | if [ "$OPT_VERBOSE" = "yes" ]; then | ||
35 | - echo " ARM (arm)" | ||
36 | + echo " AArch64 (aarch64)" | ||
37 | fi | ||
38 | - CFG_HOST_ARCH=arm | ||
39 | + CFG_HOST_ARCH=aarch64 | ||
40 | ;; | ||
41 | - *:*:aarch64*) | ||
42 | + *:*:arm*) | ||
43 | if [ "$OPT_VERBOSE" = "yes" ]; then | ||
44 | - echo " AArch64 (aarch64)" | ||
45 | + echo " ARM (arm)" | ||
46 | fi | ||
47 | - CFG_HOST_ARCH=aarch64 | ||
48 | + CFG_HOST_ARCH=arm | ||
49 | ;; | ||
50 | Linux:*:sparc*) | ||
51 | if [ "$OPT_VERBOSE" = "yes" ]; then | ||
52 | -- | ||
53 | 2.1.0 | ||