diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-08 15:36:11 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-15 15:23:26 +0300 |
commit | 34f4b7b004eb6fa46282fff5d8c8026caf64740b (patch) | |
tree | 290ec0cd4ee39c1f97c4a45a1a4cabd80e9d8b49 /recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch | |
parent | 7de0cbd5dc9f80972ce559c9e340afbff0b9403d (diff) | |
download | meta-qt5-34f4b7b004eb6fa46282fff5d8c8026caf64740b.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.15 branch
Task-number: QTBUG-80823
Change-Id: I72ecac4a29bf1d1f072169d709aa7ecdc895c0e5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch index 225e7157..fc95edd7 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bf8381f35e8f4aeac0cbdb9b4a960bccf259f69c Mon Sep 17 00:00:00 2001 | 1 | From c00840448ba1df98a8e9d831bc3ddb795cf37a98 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 1 Feb 2020 12:17:23 -0800 | 3 | Date: Sat, 1 Feb 2020 12:17:23 -0800 |
4 | Subject: [PATCH] chromium: Link v8 with libatomic on x86 | 4 | Subject: [PATCH] chromium: Link v8 with libatomic on x86 |
@@ -14,16 +14,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | 14 | 1 file changed, 2 insertions(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn | 16 | diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn |
17 | index 426d83b4561..501e78d793c 100644 | 17 | index 9107b302476..12d8171d238 100644 |
18 | --- a/chromium/v8/BUILD.gn | 18 | --- a/chromium/v8/BUILD.gn |
19 | +++ b/chromium/v8/BUILD.gn | 19 | +++ b/chromium/v8/BUILD.gn |
20 | @@ -3405,7 +3405,8 @@ v8_source_set("v8_base_without_compiler") { | 20 | @@ -3324,7 +3324,8 @@ v8_source_set("v8_base_without_compiler") { |
21 | if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" || | 21 | if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" || |
22 | v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" || | 22 | v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" || |
23 | v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" || | 23 | v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" || |
24 | - v8_current_cpu == "s390" || v8_current_cpu == "s390x") { | 24 | - v8_current_cpu == "s390" || v8_current_cpu == "s390x") { |
25 | + v8_current_cpu == "s390" || v8_current_cpu == "s390x" || | 25 | + v8_current_cpu == "s390" || v8_current_cpu == "s390x" || |
26 | + v8_current_cpu == "x86") { | 26 | + v8_current_cpu == "x86") { |
27 | libs = [ "atomic" ] | 27 | libs += [ "atomic" ] |
28 | } | 28 | } |
29 | 29 | ||