From 9a645b029a7752a83af78c8b69c4c472a3a40a12 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 13 Mar 2020 12:12:45 +0100 Subject: qtwebengine: update patches for latest 5.15 revision Signed-off-by: Martin Jansa --- .../chromium/0003-chromium-fix-build-with-clang.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 cd789fba..90eb8b79 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 a7112509e81a1dfff6c266f34f33a11f58a8468e Mon Sep 17 00:00:00 2001 +From 114296ba7b2c66583e5ee6b84e4db3759d4fd1dc 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 be485fd89b9..7179df05451 100644 +index ab47e2b98f8..f5ac335af90 100644 --- a/chromium/build/config/compiler/BUILD.gn +++ b/chromium/build/config/compiler/BUILD.gn -@@ -773,8 +773,6 @@ config("compiler_cpu_abi") { +@@ -774,8 +774,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm") { if (is_clang && !is_android && !is_nacl) { @@ -22,7 +22,7 @@ index be485fd89b9..7179df05451 100644 } if (!is_nacl) { cflags += [ -@@ -787,8 +785,6 @@ config("compiler_cpu_abi") { +@@ -788,8 +786,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia) { @@ -31,7 +31,7 @@ index be485fd89b9..7179df05451 100644 } } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] -@@ -797,9 +793,6 @@ config("compiler_cpu_abi") { +@@ -798,9 +794,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mipsel-linux-android" ] ldflags += [ "--target=mipsel-linux-android" ] @@ -41,7 +41,7 @@ index be485fd89b9..7179df05451 100644 } } else { cflags += [ "-EL" ] -@@ -878,10 +871,7 @@ config("compiler_cpu_abi") { +@@ -879,10 +872,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 be485fd89b9..7179df05451 100644 cflags += [ "-EB" ] ldflags += [ "-EB" ] } -@@ -928,9 +918,6 @@ config("compiler_cpu_abi") { +@@ -929,9 +919,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mips64el-linux-android" ] ldflags += [ "--target=mips64el-linux-android" ] @@ -63,7 +63,7 @@ index be485fd89b9..7179df05451 100644 } } else { cflags += [ -@@ -987,10 +974,7 @@ config("compiler_cpu_abi") { +@@ -988,10 +975,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips64") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -75,7 +75,7 @@ index be485fd89b9..7179df05451 100644 cflags += [ "-EB", "-mabi=64", -@@ -1169,13 +1153,6 @@ config("compiler_deterministic") { +@@ -1160,13 +1144,6 @@ config("compiler_deterministic") { } } } -- cgit v1.2.3-54-g00ecf