sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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
This commit is contained in:
Martin Jansa 2013-04-03 16:51:02 +02:00
parent e9c61a9e6f
commit 94ca12bf49
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
classes/qmake5_base.bbclass
View File

@ -1,6 +1,8 @@
QMAKE_MKSPEC_PATH ?= "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs"
QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs"
OE_QMAKE_PLATFORM_NATIVE = "${BUILD_OS}-oe-g++"
QMAKE_MKSPEC_PATH = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs"
OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++"
QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}"
EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'"
@ -13,7 +15,8 @@ EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \
RCC="${OE_QMAKE_RCC}" \
MAKE="make -e ${PARALLEL_MAKE}"'
export QMAKESPEC = "${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++"
export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/${OE_QMAKE_PLATFORM_NATIVE}"
export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}"
export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake"
export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic"
export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc"