diff options
| author |   Ilya Yanok <yanok@emcraft.com> | 2011-05-09 23:12:55 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-10 09:57:09 +0100 |
| commit | f5cf43596be04343e7f1b8186f30538c79327342 (patch) | |
| tree | 68a19b673d48c0091ae706e5b8be605a59ca3972 | |
| parent | 2277c3054a7f78aa45945aeba1bbb7ff86b4516a (diff) | |
| download | openembedded-core-contrib-f5cf43596be04343e7f1b8186f30538c79327342.tar.gz | |
toolchain-qte: include cross-compiler and fix env script
This patch fixes the meta-toolchain-qte recipe:
1. cross-compiler added to the TOOLCHAIN_HOST_TASK.
2. Corrected paths in the environment script.
3. TOOLCHAIN_OUTPUTNAME used instead of SDK_SUFFIX.
(From OE-Core rev: 2b4971128a66eb0efdc8663018710383041c0e11)
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-qt/meta/meta-toolchain-qte.bb | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb index da0dda77c9a..72fa702c777 100644 --- a/meta/recipes-qt/meta/meta-toolchain-qte.bb +++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb @@ -1,26 +1,27 @@ # Qt Embedded toolchain PR = "r5" -TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host" +TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}" TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target" +TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}" require recipes-core/meta/meta-toolchain.bb -SDK_SUFFIX = "toolchain-qte" QT_DIR_NAME = "qtopia" +QT_TOOLS_PREFIX = "${SDKPATHNATIVE}${bindir_nativesdk}" toolchain_create_sdk_env_script_append() { - echo 'export OE_QMAKE_CC=${TARGET_SYS}-gcc' >> $script - echo 'export OE_QMAKE_CXX=${TARGET_SYS}-g++' >> $script - echo 'export OE_QMAKE_LINK=${TARGET_SYS}-g++' >> $script - echo 'export OE_QMAKE_AR=${TARGET_SYS}-ar' >> $script - echo 'export OE_QMAKE_LIBDIR_QT=${SDKPATH}/${TARGET_SYS}/${libdir}' >> $script - echo 'export OE_QMAKE_INCDIR_QT=${SDKPATH}/${TARGET_SYS}/${includedir}/${QT_DIR_NAME}' >> $script - echo 'export OE_QMAKE_MOC=${SDKPATH}/bin/moc4' >> $script - echo 'export OE_QMAKE_UIC=${SDKPATH}/bin/uic4' >> $script - echo 'export OE_QMAKE_UIC3=${SDKPATH}/bin/uic34' >> $script - echo 'export OE_QMAKE_RCC=${SDKPATH}/bin/rcc4' >> $script - echo 'export OE_QMAKE_QDBUSCPP2XML=${SDKPATH}/bin/qdbuscpp2xml4' >> $script - echo 'export OE_QMAKE_QDBUSXML2CPP=${SDKPATH}/bin/qdbusxml2cpp4' >> $script - echo 'export OE_QMAKE_QT_CONFIG=${SDKPATH}/${TARGET_SYS}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script - echo 'export QMAKESPEC=${SDKPATH}/${TARGET_SYS}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script + echo 'export OE_QMAKE_CC=${TARGET_PREFIX}gcc' >> $script + echo 'export OE_QMAKE_CXX=${TARGET_PREFIX}g++' >> $script + echo 'export OE_QMAKE_LINK=${TARGET_PREFIX}g++' >> $script + echo 'export OE_QMAKE_AR=${TARGET_PREFIX}ar' >> $script + echo 'export OE_QMAKE_LIBDIR_QT=${SDKTARGETSYSROOT}/${libdir}' >> $script + echo 'export OE_QMAKE_INCDIR_QT=${SDKTARGETSYSROOT}/${includedir}/${QT_DIR_NAME}' >> $script + echo 'export OE_QMAKE_MOC=${QT_TOOLS_PREFIX}/moc4' >> $script + echo 'export OE_QMAKE_UIC=${QT_TOOLS_PREFIX}/uic4' >> $script + echo 'export OE_QMAKE_UIC3=${QT_TOOLS_PREFIX}/uic34' >> $script + echo 'export OE_QMAKE_RCC=${QT_TOOLS_PREFIX}/rcc4' >> $script + echo 'export OE_QMAKE_QDBUSCPP2XML=${QT_TOOLS_PREFIX}/qdbuscpp2xml4' >> $script + echo 'export OE_QMAKE_QDBUSXML2CPP=${QT_TOOLS_PREFIX}/qdbusxml2cpp4' >> $script + echo 'export OE_QMAKE_QT_CONFIG=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script + echo 'export QMAKESPEC=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script } |