From d6b6838e55aae46699e4dbdc24c13bc405e94f32 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 21 Apr 2020 18:14:40 +0200 Subject: qt5: upgrade to 5.15 beta4 Signed-off-by: Martin Jansa --- .../0003-chromium-fix-build-with-clang.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch') 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 index 0171a5dd..eeb3f640 100644 --- 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 @@ -1,4 +1,4 @@ -From e590e511b89a08867a801cb20e4e98787cb36e78 Mon Sep 17 00:00:00 2001 +From dd5033e3b9a425b3435629d9e8901b8445119fdb Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Feb 2019 19:28:59 -0800 Subject: [PATCH] chromium: fix build with clang @@ -10,10 +10,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn -index ab47e2b98f8..f5ac335af90 100644 +index fdfcf65f5ab..13d71d04030 100644 --- a/chromium/build/config/compiler/BUILD.gn +++ b/chromium/build/config/compiler/BUILD.gn -@@ -774,8 +774,6 @@ config("compiler_cpu_abi") { +@@ -779,8 +779,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm") { if (is_clang && !is_android && !is_nacl) { @@ -22,7 +22,7 @@ index ab47e2b98f8..f5ac335af90 100644 } if (!is_nacl) { cflags += [ -@@ -788,8 +786,6 @@ config("compiler_cpu_abi") { +@@ -793,8 +791,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia) { @@ -31,7 +31,7 @@ index ab47e2b98f8..f5ac335af90 100644 } } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] -@@ -798,9 +794,6 @@ config("compiler_cpu_abi") { +@@ -803,9 +799,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mipsel-linux-android" ] ldflags += [ "--target=mipsel-linux-android" ] @@ -41,7 +41,7 @@ index ab47e2b98f8..f5ac335af90 100644 } } else { cflags += [ "-EL" ] -@@ -879,10 +872,7 @@ config("compiler_cpu_abi") { +@@ -884,10 +877,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -53,7 +53,7 @@ index ab47e2b98f8..f5ac335af90 100644 cflags += [ "-EB" ] ldflags += [ "-EB" ] } -@@ -929,9 +919,6 @@ config("compiler_cpu_abi") { +@@ -934,9 +924,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mips64el-linux-android" ] ldflags += [ "--target=mips64el-linux-android" ] @@ -63,7 +63,7 @@ index ab47e2b98f8..f5ac335af90 100644 } } else { cflags += [ -@@ -988,10 +975,7 @@ config("compiler_cpu_abi") { +@@ -993,10 +980,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips64") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -75,7 +75,7 @@ index ab47e2b98f8..f5ac335af90 100644 cflags += [ "-EB", "-mabi=64", -@@ -1160,13 +1144,6 @@ config("compiler_deterministic") { +@@ -1165,13 +1149,6 @@ config("compiler_deterministic") { } } } @@ -83,7 +83,7 @@ index ab47e2b98f8..f5ac335af90 100644 - # Tells the compiler not to use absolute paths when passing the default - # paths to the tools it invokes. We don't want this because we don't - # really need it and it can mess up the goma cache entries. -- if (is_clang && !is_nacl) { +- if (is_clang && !is_nacl && !(use_qt && use_libcxx)) { - cflags += [ "-no-canonical-prefixes" ] - } } -- cgit v1.2.3-54-g00ecf