From 17d2bf1cdd6a6b23a88a8e07dcb640e8f01115d2 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 4 Dec 2012 16:32:32 -0800 Subject: qtbase: mkspecs are now staged correctly They are placed under STAGING_DATADIR as they need to be kept separate from the native side. The reason for doing so is that some qt modules require native tools and the mkspecs in STAGING_DATADIR_NATIVE cannot be polluted with the target mkspecs There are still some packaging issues Signed-off-by: Mikko Levonmaa --- classes/qmake5.bbclass | 2 +- classes/qmake5_base.bbclass | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index b30b1507..180cedcf 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -6,7 +6,7 @@ inherit qmake5_base QT5TOOLSDEPENDS ?= "qt5-native " DEPENDS_prepend = "${QT5TOOLSDEPENDS}" -export QMAKESPEC = "${STAGING_DATADIR_NATIVE}/qt5/mkspecs/${TARGET_OS}-oe-g++" +export QMAKESPEC = "${STAGING_DATADIR}/qt5/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc" export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc" diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 5601bb94..7012d0d7 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -22,8 +22,7 @@ Binaries = ${STAGING_BINDIR_NATIVE} Headers = ${STAGING_INCDIR}/qt5 Plugins = ${STAGING_LIBDIR}/qt5/plugins/ Libraries = ${STAGING_LIBDIR} -Mkspecs = ${STAGING_DATADIR}/qt5/mkspecs/ -HostData = ${STAGING_DATADIR_NATIVE}/qt5 +HostData = ${STAGING_DATADIR}/qt5 HostBinaries = ${STAGING_BINDIR_NATIVE}/ EOF } -- cgit v1.2.3-54-g00ecf