diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-14 15:06:28 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-15 10:10:47 +0300 |
commit | 63dec9bbd826a4afafa7177aaa3439467f25d80a (patch) | |
tree | afcff4f6d8c72cb4a51f1e27cda2a65aeb55d712 /recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch | |
parent | 79791026ff20539180027de0d796f8acd55bc7bf (diff) | |
parent | 53500ade778bac6e1733db43fc41c290d7b9d16b (diff) | |
download | meta-qt5-63dec9bbd826a4afafa7177aaa3439467f25d80a.tar.gz |
Merge remote-tracking branch 'origin/upstream/master' into 5.13
* origin/upstream/master:
qtdeclarative: Use qmlcachegen provided by OE instead of system one.
qtbase-native: Always use qt provided doubleconversion library.
qttools: Enable clang support when using clang
qt5-creator: update to v4.9.2
maliit-framework-qt5: Fix build when ptest is enabled
qtwebengine: Fix build on aarch64
qtwebengine: refresh the patches to apply
qtremoteobjects: Use OE_PATH_EXTERNAL_HOST_BINS to enable cmake to find repc
qt5: Upgrade to Qt 5.13.0
Allow enabling gui for native and nativesdk
qt5everywheredemo: update HOMEPAGE
qtconnectivity,qtsystems: Account for bluez4 from oe-core
gdb_%.bbappend: Avoid PAK archive (application/x-pak)
Change-Id: I24e0b7b95920df3722f84a1f3a2e74546dc74810
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch new file mode 100644 index 00000000..d8eca0c6 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 27d1c407b98979445e216c6fd105e78014e928b1 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 | march/mtune/float-abi OE config machinary has computed these values already | ||
6 | and fed it via compiler cmdline to chromium build | ||
7 | |||
8 | I think upstream should check for the values on compiler cmdline | ||
9 | before overriding these | ||
10 | |||
11 | Upstream-Status: Inappropriate [OE-Specific] | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com> | ||
15 | --- | ||
16 | chromium/build/config/compiler/BUILD.gn | 9 --------- | ||
17 | 1 file changed, 9 deletions(-) | ||
18 | |||
19 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn | ||
20 | index 6f2eff6f5ef..57a950a435a 100644 | ||
21 | --- a/chromium/build/config/compiler/BUILD.gn | ||
22 | +++ b/chromium/build/config/compiler/BUILD.gn | ||
23 | @@ -809,15 +809,6 @@ config("compiler_cpu_abi") { | ||
24 | } else if (current_cpu == "arm") { | ||
25 | if (is_clang && !is_android && !is_nacl) { | ||
26 | } | ||
27 | - if (!is_nacl) { | ||
28 | - cflags += [ | ||
29 | - "-march=$arm_arch", | ||
30 | - "-mfloat-abi=$arm_float_abi", | ||
31 | - ] | ||
32 | - } | ||
33 | - if (arm_tune != "") { | ||
34 | - cflags += [ "-mtune=$arm_tune" ] | ||
35 | - } | ||
36 | } else if (current_cpu == "arm64") { | ||
37 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { | ||
38 | } | ||