diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-06-04 08:25:55 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-06-04 08:31:38 +0300 |
commit | 0106f58f31df6b426dca2bb810fed5009d4cb28f (patch) | |
tree | a84de94177cb0c9ae65628d0875ebe90365a2254 /recipes-qt/qt5/qtwebengine/chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch | |
parent | e990651e683b47e60fc981dc4edb285a795ae490 (diff) | |
parent | 17fb7499c12764264212b1a28eb5782c741964d5 (diff) | |
download | meta-qt5-0106f58f31df6b426dca2bb810fed5009d4cb28f.tar.gz |
Merge remote-tracking branch 'qtyocto/5.13' into dev
* qtyocto/5.13: (46 commits)
qtwayland: update module
qt5: update submodules
qt5: update submodules
qt3d-runtime: update to v2.3
qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURES
qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULT
qtbase: add libxext dependency for xcb PACKAGECONFIG
python-pyqt5: Update to version 5.12.1.
python-pyqt: Fix annoying problems.
qtwebengine: arm: use OE specified -mcpu option
Revert "qtbase: Adjust target mkspec settings"
qtbase-tools: Fix error during pkg_postinst
qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm
qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
qtwayland: check also that the destination for private headers exists before installing them
qtwayland: improve manual header installation
qtwayland: workaround upstream bug: install missing headers manually
qtwayland: disable gold for all archs like in qtbase
qt5: upgrade to 5.12.3
qtbase: disable gold for all archs not just x86
...
Change-Id: I43d594b17bfeadc102a8817285c5834062e9cd75
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch new file mode 100644 index 00000000..1e3f2c15 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 058158c568698f79c905c19e5ef32ca714f8223e 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 1/1] 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 1c42c49ea4..e919e157d7 100644 | ||
21 | --- a/chromium/build/config/compiler/BUILD.gn | ||
22 | +++ b/chromium/build/config/compiler/BUILD.gn | ||
23 | @@ -742,15 +742,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 | } | ||
39 | -- | ||
40 | 2.21.0 | ||
41 | |||