toolchain-qte: include cross-compiler and fix env script
PATCH 1/1 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.
Signed-off-by Ilya Yanok <[email protected]>
--- meta/recipes-qt/meta/meta-toolchain-qte.bb | 33 ++++++++++++++------------- 1 files changed, 17 insertions(+), 16 deletions(-)
meta/recipes-qt/meta/meta-toolchain-qte.bb +17 -16
@@ -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 }
Signature · 1 line
1.7.4.4
Quoted 48 lines · Ilya Yanok
This patch fixes the meta-toolchain-qte recipe:
1. cross-compiler added to theTOOLCHAIN_HOST_TASK.
2. Corrected paths in the environment script.
3.TOOLCHAIN_OUTPUTNAMEused instead ofSDK_SUFFIX.Signed-off-by Ilya Yanok<[email protected]>--- meta/recipes-qt/meta/meta-toolchain-qte.bb | 33 ++++++++++++++------------- 1 files changed, 17 insertions(+), 16 deletions(-)meta/recipes-qt/meta/meta-toolchain-qte.bb +8
-16@@ -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
meta/recipes-qt/meta/meta-toolchain-qte.bb line 27
Quoted 10 lines
meta/recipes-qt/meta/meta-toolchain-qte.bb +9
-0+ 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 }
Pulled into oe-core and poky/master
Thanks
Sau!