From a382cfd87b2de1be25229e11a8bb9999f1c0ddf7 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Tue, 5 Oct 2010 07:10:01 +0000
Subject: meta-toolchain-qt(e): Move common parts into the
 meta-toolchain-qt.inc

---
 recipes/meta/meta-toolchain-qt.bb  | 25 ++-----------------------
 recipes/meta/meta-toolchain-qt.inc | 24 ++++++++++++++++++++++++
 recipes/meta/meta-toolchain-qte.bb | 25 ++-----------------------
 3 files changed, 28 insertions(+), 46 deletions(-)
 create mode 100644 recipes/meta/meta-toolchain-qt.inc

diff --git a/recipes/meta/meta-toolchain-qt.bb b/recipes/meta/meta-toolchain-qt.bb
index 4cdee48a1f..3674e5f6e2 100644
--- a/recipes/meta/meta-toolchain-qt.bb
+++ b/recipes/meta/meta-toolchain-qt.bb
@@ -1,5 +1,5 @@
 # Qt X11 toolchain
-PR = "r4"
+PR = "${INC_PR}.0"
 TOOLCHAIN_HOST_TASK = "task-qt-toolchain-host"
 TOOLCHAIN_TARGET_TASK = "task-qt-toolchain-target"
 
@@ -8,25 +8,4 @@ SDK_SUFFIX = "toolchain-qt"
 SDK_SUFFIX_angstrom = "toolchain-qt-${ANGSTROM_QT_VERSION}"
 
 QT_DIR_NAME = "qt4"
-
-do_populate_sdk_append() {
-       script="${SDK_OUTPUT}/${SDKPATH}/environment-setup"
-       touch $script
-       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_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
-
-       # Repack SDK with new environment-setup
-       cd ${SDK_OUTPUT}
-       fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
-}
+require meta-toolchain-qt.inc
diff --git a/recipes/meta/meta-toolchain-qt.inc b/recipes/meta/meta-toolchain-qt.inc
new file mode 100644
index 0000000000..ce80c5786b
--- /dev/null
+++ b/recipes/meta/meta-toolchain-qt.inc
@@ -0,0 +1,24 @@
+# Common Qt toolchain
+INC_PR = "r4"
+
+do_populate_sdk_append() {
+       script="${SDK_OUTPUT}/${SDKPATH}/environment-setup"
+       touch $script
+       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_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
+
+       # Repack SDK with new environment-setup
+       cd ${SDK_OUTPUT}
+       fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
+}
diff --git a/recipes/meta/meta-toolchain-qte.bb b/recipes/meta/meta-toolchain-qte.bb
index f753b39d00..5ea8a15be8 100644
--- a/recipes/meta/meta-toolchain-qte.bb
+++ b/recipes/meta/meta-toolchain-qte.bb
@@ -1,5 +1,5 @@
 # Qt Embedded toolchain
-PR = "r4"
+PR = "${INC_PR}.0"
 TOOLCHAIN_HOST_TASK = "task-qt-toolchain-host"
 TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target"
 
@@ -8,25 +8,4 @@ SDK_SUFFIX = "toolchain-qte"
 SDK_SUFFIX_angstrom = "toolchain-qte-${ANGSTROM_QT_VERSION}"
 
 QT_DIR_NAME = "qtopia"
-
-do_populate_sdk_append() {
-       script="${SDK_OUTPUT}/${SDKPATH}/environment-setup"
-       touch $script
-       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_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
-
-       # Repack SDK with new environment-setup
-       cd ${SDK_OUTPUT}
-       fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
-}
+require meta-toolchain-qt.inc
-- 
cgit 1.2.3-korg