From 28954dda752ae70778204ba03e1d5c619f8ab50f Mon Sep 17 00:00:00 2001
From: David-John Willis <John.Willis@Distant-earth.com>
Date: Fri, 18 Jun 2010 10:51:24 +0100
Subject: [PATCH 1/1] meta-toolchain-pandora: Start to work on adding Qt4
 support to SDK.

---
 recipes/meta/meta-toolchain-pandora.bb | 44 +++++++++++++++++++++++++-
 recipes/tasks/task-pandora-sdk-full.bb |  7 +++-
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/recipes/meta/meta-toolchain-pandora.bb b/recipes/meta/meta-toolchain-pandora.bb
index f6a9bec..d8b3d2e 100644
--- a/recipes/meta/meta-toolchain-pandora.bb
+++ b/recipes/meta/meta-toolchain-pandora.bb
@@ -1,9 +1,51 @@
 # OpenPandora Sample toolchain/SDK scripts.
 
-PR = "r1"
+PR = "r4"
 TOOLCHAIN_HOST_TASK = "task-pandora-toolchain-host"
 TOOLCHAIN_TARGET_TASK = "task-pandora-toolchain-target"
 
 require meta-toolchain.bb
 
 SDK_SUFFIX = "toolchain-openpandora"
+
+PANDORA_VERSION_FILE = "${SDK_OUTPUT}/${SDKPATH}/op-toolchain-version"
+
+QT_DIR_NAME = "qt4"
+
+do_populate_sdk_append() {
+
+       # SED out incorrect paths in SDK support *-config files so tools can use the files to find libs to cross compile.
+       # not ready to commit.
+
+       # Tweak the environment-setup script to get QT4 dev working.
+       
+       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
+
+
+       # Helper to say what toolchain we built, include GIT tag etc.
+
+       OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${PANDORA_VERSION_FILE};cd $OLD_PWD;
+       OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;
+       OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;
+       echo Toolchain Builder: '${LOGNAME}'@`cat /etc/hostname` >> ${PANDORA_VERSION_FILE};
+       echo Time Stamp: `date -R` >> ${PANDORA_VERSION_FILE};
+       echo Toolchain Name: '${TOOLCHAIN_OUTPUTNAME}' >> ${PANDORA_VERSION_FILE};
+
+       # Repack SDK after 'munging'
+       cd ${SDK_OUTPUT}
+       fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
+}
diff --git a/recipes/tasks/task-pandora-sdk-full.bb b/recipes/tasks/task-pandora-sdk-full.bb
index 8f1123b..4def67b 100644
--- a/recipes/tasks/task-pandora-sdk-full.bb
+++ b/recipes/tasks/task-pandora-sdk-full.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "OpenPandora: Full SDK development packages"
 
-PR = "r1"
+PR = "r2"
 ALLOW_EMPTY = "1"
 
 DEPENDS = "task-pandora-sdk-base"
@@ -48,6 +48,11 @@ RDEPENDS += "\
   libgles-omap3-dev \
 "
 
+# QT4 libs.
+RDEPENDS += "\
+  qt4-x11-free-dev \
+"
+
 # X11 Development libs.
 RDEPENDS += "\
   libxi-dev \
-- 
2.39.2