t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-03 20:54:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtwebengine: update 0004-Force-host-toolchain-configuration.patch

Browse Source 
* refresh the patch from:
  http://code.qt.io/cgit/yocto/meta-qt5.git/diff/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch?id=5bac910f95453d0df6fe540778dd16a9707dcabf

* might fix passing arm specific flags into host builds like:
  gcc: error: unrecognized command line option '-mflooat-abi=hard'
  strip: unable to recognise the format of the input file

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2017-08-21 11:58:45 +02:00
parent b7ae79a054
commit c4c70e76c1
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
View File

@@ -1,4 +1,4 @@
From 5106be504b7edb7bc75309d581dfd33a89ed04fc Mon Sep 17 00:00:00 2001
From 9bdd03ad0bbb221ad7bffe0e570605c21c28b1b5 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 15 Mar 2017 13:53:28 +0200
Subject: [PATCH] Force host toolchain configuration
@@ -6,16 +6,30 @@ Subject: [PATCH] Force host toolchain configuration
Force gcc/g++ to be used for parts using host toolchain, since
the option(host_build) does not work in yocto builds.
Don't use QT_ARCH for the host architecture, since that's always
the target architecture in bitbake builds, instead ask specifically
for the qmakes's host architecture.
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
---
src/buildtools/configure_host.pro | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
src/buildtools/configure_host.pro | 14 +++++++-------
src/core/config/linux.pri | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
index f1b3d47b..521c507b 100644
index f1b3d47b..12123729 100644
--- a/src/buildtools/configure_host.pro
+++ b/src/buildtools/configure_host.pro
@@ -4,7 +4,7 @@ TEMPLATE = aux
# Pick up the host toolchain
option(host_build)
-GN_HOST_CPU = $$gnArch($$QT_ARCH)
+GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
!isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH)
else: GN_TARGET_CPU = $$GN_HOST_CPU
GN_OS = $$gnOS()
@@ -29,9 +29,9 @@ GN_CONTENTS = \
"import(\"//build/config/sysroot.gni\")" \
"import(\"//build/toolchain/gcc_toolchain.gni\")" \
@@ -42,3 +56,16 @@ index f1b3d47b..521c507b 100644
" ar = \"$$which(ar)\" " \
" nm = \"$$which(nm)\" " \
" toolchain_args = { " \
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index 714c864d..f66ca551 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -98,7 +98,7 @@ contains(QT_ARCH, "mips"):!host_build {
host_build {
gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
- GN_HOST_CPU = $$gnArch($$QT_ARCH)
+ GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
gn_args += host_cpu=\"$$GN_HOST_CPU\"
# Don't bother trying to use system libraries in this case
gn_args += use_glib=false

2
recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch
View File

@@ -1,4 +1,4 @@
From b4eb5c926cf822ee5d5cf398d1bcdb0fdca6e47a Mon Sep 17 00:00:00 2001
From 331de4be615b8552e498ac2f3deff4b49b4b0fc0 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sun, 20 Aug 2017 20:37:38 +0200
Subject: [PATCH] qtbug-61521.cpp: use free instead of cfree