summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-01 17:39:10 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-01 17:39:10 (GMT)
commit19e1f4f672806c8a45847ce5c2adac6da663ff69 (patch)
treebbfe27295904561d17640c3b5bfc6b8e097ac7f4 /meta/recipes-qt
parentec740ac770d2124cbae1ab936d85b8343076c53b (diff)
downloadpoky-19e1f4f672806c8a45847ce5c2adac6da663ff69.tar.gz
meta-toolchain-qte: Append to the toolchain env script and remove code duplication
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/meta/meta-toolchain-qte.bb8
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb
index b57369a..da0dda7 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qte.bb
+++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb
@@ -8,9 +8,7 @@ SDK_SUFFIX = "toolchain-qte"
8 8
9QT_DIR_NAME = "qtopia" 9QT_DIR_NAME = "qtopia"
10 10
11do_populate_sdk_append() { 11toolchain_create_sdk_env_script_append() {
12 script="${SDK_OUTPUT}/${SDKPATH}/environment-setup"
13 touch $script
14 echo 'export OE_QMAKE_CC=${TARGET_SYS}-gcc' >> $script 12 echo 'export OE_QMAKE_CC=${TARGET_SYS}-gcc' >> $script
15 echo 'export OE_QMAKE_CXX=${TARGET_SYS}-g++' >> $script 13 echo 'export OE_QMAKE_CXX=${TARGET_SYS}-g++' >> $script
16 echo 'export OE_QMAKE_LINK=${TARGET_SYS}-g++' >> $script 14 echo 'export OE_QMAKE_LINK=${TARGET_SYS}-g++' >> $script
@@ -25,8 +23,4 @@ do_populate_sdk_append() {
25 echo 'export OE_QMAKE_QDBUSXML2CPP=${SDKPATH}/bin/qdbusxml2cpp4' >> $script 23 echo 'export OE_QMAKE_QDBUSXML2CPP=${SDKPATH}/bin/qdbusxml2cpp4' >> $script
26 echo 'export OE_QMAKE_QT_CONFIG=${SDKPATH}/${TARGET_SYS}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script 24 echo 'export OE_QMAKE_QT_CONFIG=${SDKPATH}/${TARGET_SYS}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
27 echo 'export QMAKESPEC=${SDKPATH}/${TARGET_SYS}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script 25 echo 'export QMAKESPEC=${SDKPATH}/${TARGET_SYS}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script
28
29 # Repack SDK with new environment-setup
30 cd ${SDK_OUTPUT}
31 tar --owner=root --group=root -cj --file=${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
32} 26}