diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-03 16:51:02 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-17 16:10:01 +0200 |
commit | 94ca12bf49ff6201b37476471403a5384b51b167 (patch) | |
tree | 7f28303130263aa7e91b1032659a153ff0875520 /classes | |
parent | e9c61a9e6f51f500df349f8fe569ec095a1b8d2b (diff) | |
download | meta-qt5-94ca12bf49ff6201b37476471403a5384b51b167.tar.gz |
qmake5_base: define both QMAKESPEC and let recipe select which one to use
* different platform/xplatform can enable cross-compile build in upstream qmake
but that's not the same as what recipes are doing (upstream builds native tools
when bootstraping target qtbase, recipes build native tools with separate
qtbase-native and then want to skip building tools)
* still separate variables for both QMAKESPECs can be useful e.g. for
other native recipes
Diffstat (limited to 'classes')
-rw-r--r-- | classes/qmake5_base.bbclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index c91f7bd1..ba13242c 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
@@ -1,6 +1,8 @@ | |||
1 | QMAKE_MKSPEC_PATH ?= "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs" | 1 | QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs" |
2 | OE_QMAKE_PLATFORM_NATIVE = "${BUILD_OS}-oe-g++" | ||
3 | |||
4 | QMAKE_MKSPEC_PATH = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs" | ||
2 | OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" | 5 | OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" |
3 | QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" | ||
4 | 6 | ||
5 | EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" | 7 | EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" |
6 | 8 | ||
@@ -13,7 +15,8 @@ EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ | |||
13 | RCC="${OE_QMAKE_RCC}" \ | 15 | RCC="${OE_QMAKE_RCC}" \ |
14 | MAKE="make -e ${PARALLEL_MAKE}"' | 16 | MAKE="make -e ${PARALLEL_MAKE}"' |
15 | 17 | ||
16 | export QMAKESPEC = "${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++" | 18 | export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/${OE_QMAKE_PLATFORM_NATIVE}" |
19 | export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" | ||
17 | export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" | 20 | export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" |
18 | export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic" | 21 | export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic" |
19 | export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc" | 22 | export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc" |