summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-03 14:13:27 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-26 00:04:56 +0200
commitfe65aed3393cf32efe6158c615e72aea407a4bc6 (patch)
treea51b0d621ad910b499a1ea5d84e349c8cbf3e4b7 /recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch
parent97738e9d62b613ea46cf8c5edb6accdff0d0b19a (diff)
downloadmeta-qt5-fe65aed3393cf32efe6158c615e72aea407a4bc6.tar.gz
qtbase: improve internal build system to support OE way of building qt
* add linux-oe-g++ mkspec directly with patch * add functions to read and eval OE_QMAKE functions from mkspec and also export them with QMakeVar to be available also for config.tests * add external-host-bindir parameter to skip building native tools even when we're in fact cross-compiling (because we have them from qtbase-native build already). * use separated ${B} and ${S} and clean ${B} when reconfiguring stalled qmake cache can be used when configure is reexecuted cleaning ${B} prevents that and provide cleaner separation * OE_QMAKE_AR cqs is added by Makefile, having it here too was causing issues * isEmpty(QT_EXTERNAL_HOST_BINS) doesn't work, so lets use exist() even when it allows to incorrectly set wrong directory and build native tools again (instead of skipping them) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch
new file mode 100644
index 00000000..d1cacd3e
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch
@@ -0,0 +1,46 @@
1From 5856e25a0653313b8f80a5a92a7817fe8eb39dc8 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 17 Apr 2013 18:06:25 +0200
4Subject: [PATCH 6/6] qt_functions: temporary remove isEmpty check
5
6* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 mkspecs/features/qt_functions.prf | 6 +++++-
11 mkspecs/features/qt_tool.prf | 2 +-
12 2 files changed, 6 insertions(+), 2 deletions(-)
13
14diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
15index e249960..105ba4c 100644
16--- a/mkspecs/features/qt_functions.prf
17+++ b/mkspecs/features/qt_functions.prf
18@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) {
19 $$1 = $$eval(QT_TOOL.$${2}.command)
20 isEmpty($$1) {
21 $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
22- isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
23+ # for some reason isEmpty does not work here, FIXME before submitting upstream
24+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5)
25+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true
26+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch
27+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
28 $$1 = $$[QT_HOST_BINS/get]/$$2
29 }
30 contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) {
31diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
32index 5518933..b0e4f28 100644
33--- a/mkspecs/features/qt_tool.prf
34+++ b/mkspecs/features/qt_tool.prf
35@@ -31,7 +31,7 @@ load(qt_targets)
36
37 # If we are doing a prefix build, create a "module" pri which enables
38 # qtPrepareTool() to work with the non-installed build.
39-!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
40+!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):!exists($$[QT_EXTERNAL_HOST_BINS]) {
41
42 isEmpty(MODULE):MODULE = $$TARGET
43
44--
451.8.2.1
46