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/qt5.inc | |
parent | 97738e9d62b613ea46cf8c5edb6accdff0d0b19a (diff) |
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/qt5.inc')
-rw-r--r-- | recipes-qt/qt5/qt5.inc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index b3ab2103..0bfe1ad4 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -55,12 +55,21 @@ QT_CONFIG_FLAGS += " \ ${QT_DEMOS} \ " +SEPB = "${WORKDIR}/build" +B = "${SEPB}" + do_configure() { set_arch set_endian # Avoid problems with the linkers, since we want the linker to be g++ unset LD + + # Similar logic is in autotools.bbclass + if [ -d ${B} -a "${S}" != "${B}" ] ; then + # Existing separate build directory, exists, remove + rm -rf "${B}/*" + fi } do_compile() { |