summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2019-07-16 10:22:32 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2019-07-16 10:23:34 +0000
commitc8b3085aa4b0030d6ef07b4703763692c2c58ec0 (patch)
treee3c7e217cd1282a1dba372966efad1c30a013a37 /recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
parentc7f882712269735ba9ad307e5d7f5e51f8f84368 (diff)
downloadmeta-qt5-c8b3085aa4b0030d6ef07b4703763692c2c58ec0.tar.gz
qtwebengine: refresh the patches to apply
* 4 musl patches didn't apply at all * 0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch is dropped, because whole chromium/device/serial/serial_io_handler_posix.cc was removed in upgrade to 73: commit 38a9a29f4f9436cace7f0e7abf9c586057df8a4e Author: Allan Sandfeld Jensen <allan.jensen@qt.io> Date: Wed Feb 13 16:23:34 2019 +0100 Subject: BASELINE: Update Chromium to 73.0.3683.37 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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",