diff options
author | Jani Suonpera <jani.suonpera@qt.io> | 2020-12-10 09:03:39 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-01-22 12:00:07 +0100 |
commit | 280487f20bca829527a597d6263b0344a01917ac (patch) | |
tree | 921fe264e59fe40394e4b38d76020ccea595a0aa /recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch | |
parent | cad441b37681ec1c23ccf20e7cbeffdc9d7ba808 (diff) | |
download | meta-qt5-280487f20bca829527a597d6263b0344a01917ac.tar.gz |
Update to Qt 5.15.2
Signed-off-by: Jani Suonpera <jani.suonpera@qt.io>
Change-Id: I5992e74cf524f9378dab64503345111b1cc159f2
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch new file mode 100644 index 00000000..5f3f4528 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 0faac107930255380ea07aa75267153022de2248 Mon Sep 17 00:00:00 2001 | ||
2 | From: Johannes Pointner <johannes.pointner@br-automation.com> | ||
3 | Date: Fri, 3 May 2019 09:12:38 +0200 | ||
4 | Subject: [PATCH] chromium: Do not try to set the guessed values for | ||
5 | |||
6 | march/mtune/float-abi OE config machinary has computed these values already | ||
7 | and fed it via compiler cmdline to chromium build | ||
8 | |||
9 | I think upstream should check for the values on compiler cmdline | ||
10 | before overriding these | ||
11 | |||
12 | Upstream-Status: Inappropriate [OE-Specific] | ||
13 | |||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com> | ||
16 | |||
17 | %% original patch: 0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch | ||
18 | --- | ||
19 | chromium/build/config/compiler/BUILD.gn | 9 --------- | ||
20 | 1 file changed, 9 deletions(-) | ||
21 | |||
22 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn | ||
23 | index d3c588b21e3..6d49fde33cc 100644 | ||
24 | --- a/chromium/build/config/compiler/BUILD.gn | ||
25 | +++ b/chromium/build/config/compiler/BUILD.gn | ||
26 | @@ -777,15 +777,6 @@ config("compiler_cpu_abi") { | ||
27 | } else if (current_cpu == "arm") { | ||
28 | if (is_clang && !is_android && !is_nacl) { | ||
29 | } | ||
30 | - if (!is_nacl) { | ||
31 | - cflags += [ | ||
32 | - "-march=$arm_arch", | ||
33 | - "-mfloat-abi=$arm_float_abi", | ||
34 | - ] | ||
35 | - } | ||
36 | - if (arm_tune != "") { | ||
37 | - cflags += [ "-mtune=$arm_tune" ] | ||
38 | - } | ||
39 | } else if (current_cpu == "arm64") { | ||
40 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { | ||
41 | } | ||