diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-03 14:13:27 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-26 00:04:56 +0200 |
commit | fe65aed3393cf32efe6158c615e72aea407a4bc6 (patch) | |
tree | a51b0d621ad910b499a1ea5d84e349c8cbf3e4b7 /recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch | |
parent | 97738e9d62b613ea46cf8c5edb6accdff0d0b19a (diff) | |
download | meta-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/0004-qmake-is-already-built-in-qtbase-native.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch new file mode 100644 index 00000000..91709741 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 956195c897287787b545e570ee976d1d2917eca8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Krelin <hacker@klever.net> | ||
3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 | ||
4 | Subject: [PATCH 4/6] qmake is already built in qtbase-native | ||
5 | |||
6 | Ported from OE by: Yu Ke <ke.yu@intel.com> | ||
7 | Upstream-Status: Inappropriate [configuration] | ||
8 | |||
9 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com> | ||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | ||
12 | configure | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/configure b/configure | ||
16 | index 50f1ef2..8710c28 100755 | ||
17 | --- a/configure | ||
18 | +++ b/configure | ||
19 | @@ -3641,7 +3641,7 @@ setBootstrapEvalVariable() | ||
20 | |||
21 | |||
22 | # build qmake | ||
23 | -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
24 | +if false; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
25 | echo "Creating qmake. Please wait..." | ||
26 | |||
27 | mkdir -p "$outpath/qmake" || exit | ||
28 | -- | ||
29 | 1.8.2.1 | ||
30 | |||