* [PATCH] toolchain-qte: include cross-compiler and fix env script
@ 2011-05-09 21:12 Ilya Yanok
2011-05-10 18:25 ` Saul Wold
0 siblings, 1 reply; 2+ messages in thread
From: Ilya Yanok @ 2011-05-09 21:12 UTC (permalink / raw)
To: poky; +Cc: Ilya Yanok
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 <yanok@emcraft.com>
---
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 da0dda7..72fa702 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
}
--
1.7.4.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] toolchain-qte: include cross-compiler and fix env script
2011-05-09 21:12 [PATCH] toolchain-qte: include cross-compiler and fix env script Ilya Yanok
@ 2011-05-10 18:25 ` Saul Wold
0 siblings, 0 replies; 2+ messages in thread
From: Saul Wold @ 2011-05-10 18:25 UTC (permalink / raw)
To: Ilya Yanok; +Cc: poky
On 05/09/2011 02:12 PM, Ilya Yanok wrote:
> 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<yanok@emcraft.com>
> ---
> 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 da0dda7..72fa702 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
> }
Pulled into oe-core and poky/master
Thanks
Sau!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-05-10 18:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-09 21:12 [PATCH] toolchain-qte: include cross-compiler and fix env script Ilya Yanok
2011-05-10 18:25 ` Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.