diff options
author | Jani Suonpera <jani.suonpera@qt.io> | 2021-01-27 09:21:29 +0200 |
---|---|---|
committer | Jani Suonpera <jani.suonpera@qt.io> | 2021-02-05 14:56:55 +0200 |
commit | a73de388e628a67490cdd7734779d405740b7fa3 (patch) | |
tree | c6410cd0062df9dde1fd02b56232027b7f865815 /recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch | |
parent | 7dfe6ec495c3e56e4fbfb1dba23291589c28f7a7 (diff) | |
download | meta-qt5-a73de388e628a67490cdd7734779d405740b7fa3.tar.gz |
qt5: update submodules for LTS 5.15
- Webengine-chromium branch changed from 83-based to 87-based.
- PACKAGECONFIGs protobuf and jsoncpp are removed because these configurations
has been removed from src/buildtools/configure.json
- DEPENDS nodejs-native added. This mandatory for chromium build.
Task-number: QTBUG-90623
Change-Id: Ic933c88399422941114915afe5baa202850928f4
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0004-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/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch new file mode 100644 index 00000000..1c3a2154 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From b1571a939a3456b576de3a2d4897ea2b1b2b4b89 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 c007eab8ec9..feb4340f522 100644 | ||
24 | --- a/chromium/build/config/compiler/BUILD.gn | ||
25 | +++ b/chromium/build/config/compiler/BUILD.gn | ||
26 | @@ -783,15 +783,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 | } | ||