summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-08-14 15:06:28 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2019-08-15 10:10:47 +0300
commit63dec9bbd826a4afafa7177aaa3439467f25d80a (patch)
treeafcff4f6d8c72cb4a51f1e27cda2a65aeb55d712 /recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
parent79791026ff20539180027de0d796f8acd55bc7bf (diff)
parent53500ade778bac6e1733db43fc41c290d7b9d16b (diff)
downloadmeta-qt5-63dec9bbd826a4afafa7177aaa3439467f25d80a.tar.gz
Merge remote-tracking branch 'origin/upstream/master' into 5.13
* origin/upstream/master: qtdeclarative: Use qmlcachegen provided by OE instead of system one. qtbase-native: Always use qt provided doubleconversion library. qttools: Enable clang support when using clang qt5-creator: update to v4.9.2 maliit-framework-qt5: Fix build when ptest is enabled qtwebengine: Fix build on aarch64 qtwebengine: refresh the patches to apply qtremoteobjects: Use OE_PATH_EXTERNAL_HOST_BINS to enable cmake to find repc qt5: Upgrade to Qt 5.13.0 Allow enabling gui for native and nativesdk qt5everywheredemo: update HOMEPAGE qtconnectivity,qtsystems: Account for bluez4 from oe-core gdb_%.bbappend: Avoid PAK archive (application/x-pak) Change-Id: I24e0b7b95920df3722f84a1f3a2e74546dc74810
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch91
1 files changed, 91 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
new file mode 100644
index 00000000..cc534fad
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
@@ -0,0 +1,91 @@
1From f290da1132af09f4cba13d5e551c75621b623247 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 2 Feb 2019 19:28:59 -0800
4Subject: [PATCH] chromium: fix build with clang
5
6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 chromium/build/config/compiler/BUILD.gn | 27 ++-----------------------
10 1 file changed, 2 insertions(+), 25 deletions(-)
11
12diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
13index dbf94c9ab6b..6f2eff6f5ef 100644
14--- a/chromium/build/config/compiler/BUILD.gn
15+++ b/chromium/build/config/compiler/BUILD.gn
16@@ -570,13 +570,6 @@ config("compiler") {
17 }
18 }
19
20- # Tells the compiler not to use absolute paths when passing the default
21- # paths to the tools it invokes. We don't want this because we don't
22- # really need it and it can mess up the goma cache entries.
23- if (is_clang && !is_nacl) {
24- cflags += [ "-no-canonical-prefixes" ]
25- }
26-
27 # C11/C++11 compiler flags setup.
28 # ---------------------------
29 if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
30@@ -815,8 +808,6 @@ config("compiler_cpu_abi") {
31 }
32 } else if (current_cpu == "arm") {
33 if (is_clang && !is_android && !is_nacl) {
34- cflags += [ "--target=arm-linux-gnueabihf" ]
35- ldflags += [ "--target=arm-linux-gnueabihf" ]
36 }
37 if (!is_nacl) {
38 cflags += [
39@@ -829,8 +820,6 @@ config("compiler_cpu_abi") {
40 }
41 } else if (current_cpu == "arm64") {
42 if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
43- cflags += [ "--target=aarch64-linux-gnu" ]
44- ldflags += [ "--target=aarch64-linux-gnu" ]
45 }
46 } else if (current_cpu == "mipsel" && !is_nacl) {
47 ldflags += [ "-Wl,--hash-style=sysv" ]
48@@ -839,9 +828,6 @@ config("compiler_cpu_abi") {
49 if (is_android) {
50 cflags += [ "--target=mipsel-linux-android" ]
51 ldflags += [ "--target=mipsel-linux-android" ]
52- } else {
53- cflags += [ "--target=mipsel-linux-gnu" ]
54- ldflags += [ "--target=mipsel-linux-gnu" ]
55 }
56 } else {
57 cflags += [ "-EL" ]
58@@ -920,10 +906,7 @@ config("compiler_cpu_abi") {
59 } else if (current_cpu == "mips" && !is_nacl) {
60 ldflags += [ "-Wl,--hash-style=sysv" ]
61 if (custom_toolchain == "") {
62- if (is_clang) {
63- cflags += [ "--target=mips-linux-gnu" ]
64- ldflags += [ "--target=mips-linux-gnu" ]
65- } else {
66+ if (!is_clang) {
67 cflags += [ "-EB" ]
68 ldflags += [ "-EB" ]
69 }
70@@ -970,9 +953,6 @@ config("compiler_cpu_abi") {
71 if (is_android) {
72 cflags += [ "--target=mips64el-linux-android" ]
73 ldflags += [ "--target=mips64el-linux-android" ]
74- } else {
75- cflags += [ "--target=mips64el-linux-gnuabi64" ]
76- ldflags += [ "--target=mips64el-linux-gnuabi64" ]
77 }
78 } else {
79 cflags += [
80@@ -1029,10 +1009,7 @@ config("compiler_cpu_abi") {
81 } else if (current_cpu == "mips64") {
82 ldflags += [ "-Wl,--hash-style=sysv" ]
83 if (custom_toolchain == "") {
84- if (is_clang) {
85- cflags += [ "--target=mips64-linux-gnuabi64" ]
86- ldflags += [ "--target=mips64-linux-gnuabi64" ]
87- } else {
88+ if (!is_clang) {
89 cflags += [
90 "-EB",
91 "-mabi=64",