diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-27 13:37:25 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-03-24 11:13:28 +0100 |
commit | 40f1b73c92731f4e18751d3a499f269c65c21a96 (patch) | |
tree | 734faeca0e9ccade77c66f04320bf50071ecbf6b /meta/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch | |
parent | e45f3d305e25ff2aef9e42697e583e6f69a9b6e6 (diff) | |
download | openembedded-core-contrib-jansa/pseudo.tar.gz |
qt5: downgrade to 5.6jansa/pseudo
* webosose isn't compatible with newer Qt
export COMP=qml-webos-framework; for i in `seq -w 1 999`; do echo $i; bitbake -v -v -DDDD -f -c compile ${COMP} 2>${COMP}-logerr.$i >${COMP}-log.$i; bitbake -v -v -DDDD -f -c package_qa ${COMP} 2>${COMP}-logerr.qa.$i >${COMP}-log.qa.$i || { cp -ra tmp-glibc/work/qemux86-oe-linux/${COMP}/ ${COMP}-workdir-$i; bitbake -c cleansstate ${COMP} ; } done
in local.conf I have only this to reproduce the failures:
PRSERV_HOST = "localhost:0"
BB_NUMBER_THREADS = "8"
PARALLEL_MAKE = "-j 32"
DISTRO_FEATURES_append = " wayland opengl"
ERROR_QA_append = " host-user-contaminated"
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch')
-rw-r--r-- | meta/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/meta/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch b/meta/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch deleted file mode 100644 index 84e430b732..0000000000 --- a/meta/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 36657d556e4f97d06aa44d874d7256c970cdad3c 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 - -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 | 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 dd0d3e3..70161c8 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() -@@ -31,9 +31,9 @@ GN_CONTENTS = \ - "import(\"//build/config/sysroot.gni\")" \ - "import(\"//build/toolchain/gcc_toolchain.gni\")" \ - "gcc_toolchain(\"host\") {" \ --" cc = \"$$which($$QMAKE_CC)\" " \ --" cxx = \"$$which($$QMAKE_CXX)\" " \ --" ld = \"$$which($$QMAKE_LINK)\" " \ -+" cc = \"$$which(gcc)\" " \ -+" cxx = \"$$which(g++)\" " \ -+" ld = \"$$which(g++)\" " \ - " ar = \"$$which(ar)\" " \ - " nm = \"$$which(nm)\" " \ - " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \ -@@ -45,9 +45,9 @@ GN_CONTENTS = \ - " } " \ - "}" \ - "gcc_toolchain(\"v8_snapshot\") {" \ --" cc = \"$$which($$QMAKE_CC)\" " \ --" cxx = \"$$which($$QMAKE_CXX)\" " \ --" ld = \"$$which($$QMAKE_LINK)\" " \ -+" cc = \"$$which(gcc)\" " \ -+" cxx = \"$$which(g++)\" " \ -+" ld = \"$$which(g++)\" " \ - " ar = \"$$which(ar)\" " \ - " nm = \"$$which(nm)\" " \ - " toolchain_args = { " \ -diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri -index 1ce3ea8..23d0793 100644 ---- a/src/core/config/linux.pri -+++ b/src/core/config/linux.pri -@@ -91,7 +91,7 @@ contains(QT_ARCH, "mips") { - - 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 |