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/qt3d/0001-Allow-a-tools-only-build.patch | |
| parent | e45f3d305e25ff2aef9e42697e583e6f69a9b6e6 (diff) | |
| download | openembedded-core-contrib-40f1b73c92731f4e18751d3a499f269c65c21a96.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/qt3d/0001-Allow-a-tools-only-build.patch')
| -rw-r--r-- | meta/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | 41 |
1 files changed, 9 insertions, 32 deletions
diff --git a/meta/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/meta/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index 66c8017329..63db818420 100644 --- a/meta/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/meta/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -1,25 +1,23 @@ -From 05562960b7a3ed7753c9a39a7032fea873fc4098 Mon Sep 17 00:00:00 2001 +From e46d749532d1ca5f74d5c4d8d690972675e5c638 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@theqtcompany.com> Date: Wed, 10 Feb 2016 09:02:09 +0200 Subject: [PATCH] Allow a tools-only build --- - qt3d.pro | 7 ++++++- - src/3rdparty/assimp/assimp_dependency.pri | 2 +- - tools/tools.pro | 2 +- - 3 files changed, 8 insertions(+), 3 deletions(-) + qt3d.pro | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qt3d.pro b/qt3d.pro -index 2cc347a..81cdeef 100644 +index a26e76d..016fb30 100644 --- a/qt3d.pro +++ b/qt3d.pro @@ -1,4 +1,4 @@ --requires(qtConfig(opengl)) -+!tools-only:requires(qtConfig(opengl)) +-requires(contains(QT_CONFIG, opengl)) ++!tools-only:requires(contains(QT_CONFIG, opengl)) - CONFIG += examples_need_tools - load(qt_parts) -@@ -14,3 +14,8 @@ load(qt_parts) + load(configure) + qtCompileTest(assimp) +@@ -17,3 +17,8 @@ load(qt_parts) OTHER_FILES += \ sync.profile @@ -28,24 +26,3 @@ index 2cc347a..81cdeef 100644 + sub_tools.depends -= sub_src + SUBDIRS = sub_tools +} -diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri -index 8ba2d9a..e973d93 100644 ---- a/src/3rdparty/assimp/assimp_dependency.pri -+++ b/src/3rdparty/assimp/assimp_dependency.pri -@@ -1,5 +1,5 @@ - QT_FOR_CONFIG += 3dcore-private --qtConfig(system-assimp):!if(cross_compile:host_build) { -+!tools-only:qtConfig(system-assimp):!if(cross_compile:host_build) { - QMAKE_USE_PRIVATE += assimp - } else { - include(assimp.pri) -diff --git a/tools/tools.pro b/tools/tools.pro -index 8e973ae..ad51db5 100644 ---- a/tools/tools.pro -+++ b/tools/tools.pro -@@ -1,4 +1,4 @@ - TEMPLATE = subdirs - QT_FOR_CONFIG += 3dcore-private --!android:qtConfig(assimp):qtConfig(commandlineparser): \ -+!android:tools-only|qtConfig(assimp):qtConfig(commandlineparser): \ - SUBDIRS += qgltf |