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-11-26 16:07:49 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2019-11-27 07:38:23 +0200
commit3bd81f1997683774dd28e6b8673c9b19b66a73ec (patch)
tree368a37454e3d7031b33a609ef9a428fa43c73880 /recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
parent08cc9ad2579f897b84d4fb430d898103dc568d26 (diff)
parent929b2ef266c6eb4cc1f5500f421fda449cd8900b (diff)
downloadmeta-qt5-3bd81f1997683774dd28e6b8673c9b19b66a73ec.tar.gz
Merge remote-tracking branch 'qt/5.14' into 5.15
* qt/5.14: (22 commits) qtwebengine: add clang fix qt5: update submodules qt5: use PACKAGECONFIG to disable tests and examples qt5: update submodules qt5: update submodules qt5: update submodules qt5: update submodules ogl-runtime: update to v2.5.0 release qttools: don't install tst_qtattributionsscanner qt5: Upgrade to Qt 5.13.2 python(3)-pyqt5: add qml support libqofono: bump SRCREV and add a fix for voicecall qt5: update submodules qt5: update submodules qtbase: add openssl PACKAGECONFIG for native nativesdk ogl-runtime: update to 2.5 qtbase: Add PACKAGECONFIG for lttng layer: Mark zeus as compatible release ogl-runtime: Fix build on x86_64 README.md: Document need for 32bit host compiler ... Change-Id: I3892eef7a2ee02cde0f493df7aa1a27f683f1799
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..278a9b0c
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
@@ -0,0 +1,91 @@
1From 156dd87c5579c355a8668c6b78c3853f2d288846 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 17f486447fe..06c93e5b3cf 100644
14--- a/chromium/build/config/compiler/BUILD.gn
15+++ b/chromium/build/config/compiler/BUILD.gn
16@@ -773,8 +773,6 @@ config("compiler_cpu_abi") {
17 }
18 } else if (current_cpu == "arm") {
19 if (is_clang && !is_android && !is_nacl) {
20- cflags += [ "--target=arm-linux-gnueabihf" ]
21- ldflags += [ "--target=arm-linux-gnueabihf" ]
22 }
23 if (!is_nacl) {
24 cflags += [
25@@ -787,8 +785,6 @@ config("compiler_cpu_abi") {
26 }
27 } else if (current_cpu == "arm64") {
28 if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
29- cflags += [ "--target=aarch64-linux-gnu" ]
30- ldflags += [ "--target=aarch64-linux-gnu" ]
31 }
32 } else if (current_cpu == "mipsel" && !is_nacl) {
33 ldflags += [ "-Wl,--hash-style=sysv" ]
34@@ -797,9 +793,6 @@ config("compiler_cpu_abi") {
35 if (is_android) {
36 cflags += [ "--target=mipsel-linux-android" ]
37 ldflags += [ "--target=mipsel-linux-android" ]
38- } else {
39- cflags += [ "--target=mipsel-linux-gnu" ]
40- ldflags += [ "--target=mipsel-linux-gnu" ]
41 }
42 } else {
43 cflags += [ "-EL" ]
44@@ -878,10 +871,7 @@ config("compiler_cpu_abi") {
45 } else if (current_cpu == "mips" && !is_nacl) {
46 ldflags += [ "-Wl,--hash-style=sysv" ]
47 if (custom_toolchain == "") {
48- if (is_clang) {
49- cflags += [ "--target=mips-linux-gnu" ]
50- ldflags += [ "--target=mips-linux-gnu" ]
51- } else {
52+ if (!is_clang) {
53 cflags += [ "-EB" ]
54 ldflags += [ "-EB" ]
55 }
56@@ -928,9 +918,6 @@ config("compiler_cpu_abi") {
57 if (is_android) {
58 cflags += [ "--target=mips64el-linux-android" ]
59 ldflags += [ "--target=mips64el-linux-android" ]
60- } else {
61- cflags += [ "--target=mips64el-linux-gnuabi64" ]
62- ldflags += [ "--target=mips64el-linux-gnuabi64" ]
63 }
64 } else {
65 cflags += [
66@@ -987,10 +974,7 @@ config("compiler_cpu_abi") {
67 } else if (current_cpu == "mips64") {
68 ldflags += [ "-Wl,--hash-style=sysv" ]
69 if (custom_toolchain == "") {
70- if (is_clang) {
71- cflags += [ "--target=mips64-linux-gnuabi64" ]
72- ldflags += [ "--target=mips64-linux-gnuabi64" ]
73- } else {
74+ if (!is_clang) {
75 cflags += [
76 "-EB",
77 "-mabi=64",
78@@ -1169,13 +1153,6 @@ config("compiler_deterministic") {
79 }
80 }
81 }
82-
83- # Tells the compiler not to use absolute paths when passing the default
84- # paths to the tools it invokes. We don't want this because we don't
85- # really need it and it can mess up the goma cache entries.
86- if (is_clang && !is_nacl) {
87- cflags += [ "-no-canonical-prefixes" ]
88- }
89 }
90
91 config("clang_revision") {