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

qtbase: use the correct tools from the native sysroot 

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
This commit is contained in:
Mikko Levonmaa 2012-12-03 11:14:35 -08:00
parent 05d88f867d
commit cba28bbc10
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/qmake5.bbclass
View File

@ -6,7 +6,7 @@ inherit qmake5_base
QT5TOOLSDEPENDS ?= "qt5-native " QT5TOOLSDEPENDS ?= "qt5-native "
DEPENDS_prepend = "${QT5TOOLSDEPENDS}" DEPENDS_prepend = "${QT5TOOLSDEPENDS}"
export QMAKESPEC = "${STAGING_DATADIR_NATIVE}/qt5/mkspecs/${TARGET_OS}-oe-g++" #export QMAKESPEC = "${STAGING_DATADIR_NATIVE}/qt5/mkspecs/${TARGET_OS}-oe-g++"
export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic"
export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc"
export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc" export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc"

2
classes/qmake5_base.bbclass
View File

@ -21,7 +21,7 @@ Prefix =
Binaries = ${STAGING_BINDIR_NATIVE} Binaries = ${STAGING_BINDIR_NATIVE}
Headers = ${STAGING_INCDIR}/qt5 Headers = ${STAGING_INCDIR}/qt5
Plugins = ${STAGING_LIBDIR}/qt5/plugins/ Plugins = ${STAGING_LIBDIR}/qt5/plugins/
Libraries = ${STAGING_LIBDIR}/qt5-test Libraries = ${STAGING_LIBDIR}
Mkspecs = ${STAGING_DATADIR}/qt5/mkspecs/ Mkspecs = ${STAGING_DATADIR}/qt5/mkspecs/
HostData = ${STAGING_DATADIR_NATIVE}/qt5 HostData = ${STAGING_DATADIR_NATIVE}/qt5
HostBinaries = ${STAGING_BINDIR_NATIVE}/ HostBinaries = ${STAGING_BINDIR_NATIVE}/

26
recipes-qt/qt5/qt5.inc
View File

@ -62,8 +62,13 @@ QT_CONFIG_FLAGS += " \
${QT_DEMOS} \ ${QT_DEMOS} \
" "
EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -d -after \
INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
AR="${TARGET_PREFIX}ar cqs" \
MOC="${STAGING_BINDIR_NATIVE}/moc" UIC="${STAGING_BINDIR_NATIVE}/uic" MAKE="make -e"'
EXTRA_OEMAKE = "-e" export QT_CONF_PATH="${S}/qt.conf"
do_configure() { do_configure() {
set_endian set_endian
@ -85,6 +90,21 @@ do_configure() {
## FIXME, the file nameing is dumb... ## FIXME, the file nameing is dumb...
cp ${WORKDIR}/qmake-build.conf.sh mkspecs/build-oe-g++/qmake.conf cp ${WORKDIR}/qmake-build.conf.sh mkspecs/build-oe-g++/qmake.conf
#export QT_CONF_PATH="${S}/qt.conf"
echo "[Paths]" > $QT_CONF_PATH
#echo "Prefix=${prefix}" >> $QT_CONF_PATH
echo "Binaries=${bindir}" >> $QT_CONF_PATH
echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
echo "Libraries=${libdir}" >> $QT_CONF_PATH
echo "Plugins=${libdir}/qt5/plugins" >> $QT_CONF_PATH
echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH
echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH
echo "HostBinaries=${STAGING_BINDIR_NATIVE}" >> $QT_CONF_PATH
echo "HostData=${S}" >> $QT_CONF_PATH
./configure -v \ ./configure -v \
-opensource -confirm-license \ -opensource -confirm-license \
-prefix ${prefix} \ -prefix ${prefix} \
@ -98,7 +118,7 @@ do_configure() {
-importdir ${libdir}/${QT_DIR_NAME}/imports \ -importdir ${libdir}/${QT_DIR_NAME}/imports \
-translationdir ${datadir}/${QT_DIR_NAME}/translations \ -translationdir ${datadir}/${QT_DIR_NAME}/translations \
-examplesdir ${bindir}/${QT_DIR_NAME}/examples \ -examplesdir ${bindir}/${QT_DIR_NAME}/examples \
-platform build-oe-g++ \ -platform ${TARGET_OS}-oe-g++ \
-xplatform ${TARGET_OS}-oe-g++ \ -xplatform ${TARGET_OS}-oe-g++ \
${QT_CONFIG_FLAGS} ${QT_CONFIG_FLAGS}
} }
@ -108,7 +128,7 @@ do_compile() {
export QMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++" export QMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++"
oe_runmake oe_runmake ${EXTRA_ENV}
} }
do_install() { do_install() {