summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLei Maohui <leimaohui@cn.fujitsu.com>2018-08-31 17:36:31 +0900
committerMartin Jansa <Martin.Jansa@gmail.com>2018-09-19 09:55:38 +0000
commita8832a7f4f4a7960c9b800b49ad45032ad05a080 (patch)
tree99174a6b3a9f733502ea0c55edc246996efc24ea
parent215e81d2859926ec05fc197573b90ac3fea89019 (diff)
downloadmeta-qt5-a8832a7f4f4a7960c9b800b49ad45032ad05a080.tar.gz
qtwebkit: Make qtwebkit support arm32 BE.
* It can work on arm32 BE. * MJ: modified to apply correctly Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/qtwebkit/0004-Fix-build-bug-for-armv32-BE.patch25
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb3
2 files changed, 27 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0004-Fix-build-bug-for-armv32-BE.patch b/recipes-qt/qt5/qtwebkit/0004-Fix-build-bug-for-armv32-BE.patch
new file mode 100644
index 00000000..23fed74f
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/0004-Fix-build-bug-for-armv32-BE.patch
@@ -0,0 +1,25 @@
1From 5aa039af074c20bea1398f7f18712dc494a5f138 Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@cn.fujitsu.com>
3Date: Fri, 31 Aug 2018 15:42:48 +0900
4Subject: [PATCH] Fix build bug for armv32 BE.
5
6Upstream-Status: Pending
7
8Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
9---
10 Source/WTF/wtf/dtoa/utils.h | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h
14index 889642cee..05302e6e6 100644
15--- a/Source/WTF/wtf/dtoa/utils.h
16+++ b/Source/WTF/wtf/dtoa/utils.h
17@@ -49,7 +49,7 @@
18 defined(__ARMEL__) || \
19 defined(_MIPS_ARCH_MIPS32R2)
20 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
21-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
22+#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(ARM)
23 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
24 #elif defined(_M_IX86) || defined(__i386__)
25 #if defined(_WIN32)
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 8714d18f..0a978357 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -10,11 +10,12 @@ LIC_FILES_CHKSUM = " \
10DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native bison-native" 10DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native bison-native"
11 11
12# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.11 12# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.11
13# 5.11.meta-qt5.1 13# 5.11.meta-qt5.2
14SRC_URI += "\ 14SRC_URI += "\
15 file://0001-Do-not-skip-build-for-cross-compile.patch \ 15 file://0001-Do-not-skip-build-for-cross-compile.patch \
16 file://0002-Fix-build-with-non-glibc-libc-on-musl.patch \ 16 file://0002-Fix-build-with-non-glibc-libc-on-musl.patch \
17 file://0003-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ 17 file://0003-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
18 file://0004-Fix-build-bug-for-armv32-BE.patch \
18" 19"
19 20
20inherit cmake_qt5 perlnative pythonnative 21inherit cmake_qt5 perlnative pythonnative