diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-01-14 15:36:23 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-01 16:32:43 +0000 |
commit | f33d78ffef9d4b841dd734ca44b0c6c54e097bb8 (patch) | |
tree | 95af3a78ceb2adc8ca0200b14cf6b69862cece71 /meta | |
parent | f0a81bbe0449a29edfcaba944e568e9731fe716d (diff) | |
download | poky-f33d78ffef9d4b841dd734ca44b0c6c54e097bb8.tar.gz |
qt4: Add meta-toolchain-qte and dependent tasks from OpenEmbedded
Differences from OE versions:
task-qte-toolchain-target.bb:
* Depend on task-poky-standalone-sdk-target instead of task-sdk-bare
* Add LIC_FILES_CHKSUM
* Correct libsqlite3-dev dependency for Poky
* Remove dependency on libts-dev
* Remove QtDeclarative as it does not build for 4.6.3. (This will need
to be addressed in a future update.)
task-qte-toolchain-host.bb
* Fix for Poky directory structure
* qt4-tools-sdk -> qt4-tools-nativesdk
meta-toolchain-qte:
* Fix for Poky directory structure
* Use "tar --owner=root" instead of fakeroot
* Remove angstrom-specific suffix
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-qt/meta/meta-toolchain-qte.bb | 32 | ||||
-rw-r--r-- | meta/recipes-qt/tasks/task-qte-toolchain-host.bb | 7 | ||||
-rw-r--r-- | meta/recipes-qt/tasks/task-qte-toolchain-target.bb | 35 |
3 files changed, 74 insertions, 0 deletions
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb new file mode 100644 index 0000000000..b57369a937 --- /dev/null +++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb | |||
@@ -0,0 +1,32 @@ | |||
1 | # Qt Embedded toolchain | ||
2 | PR = "r5" | ||
3 | TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host" | ||
4 | TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target" | ||
5 | |||
6 | require recipes-core/meta/meta-toolchain.bb | ||
7 | SDK_SUFFIX = "toolchain-qte" | ||
8 | |||
9 | QT_DIR_NAME = "qtopia" | ||
10 | |||
11 | do_populate_sdk_append() { | ||
12 | script="${SDK_OUTPUT}/${SDKPATH}/environment-setup" | ||
13 | touch $script | ||
14 | echo 'export OE_QMAKE_CC=${TARGET_SYS}-gcc' >> $script | ||
15 | echo 'export OE_QMAKE_CXX=${TARGET_SYS}-g++' >> $script | ||
16 | echo 'export OE_QMAKE_LINK=${TARGET_SYS}-g++' >> $script | ||
17 | echo 'export OE_QMAKE_AR=${TARGET_SYS}-ar' >> $script | ||
18 | echo 'export OE_QMAKE_LIBDIR_QT=${SDKPATH}/${TARGET_SYS}/${libdir}' >> $script | ||
19 | echo 'export OE_QMAKE_INCDIR_QT=${SDKPATH}/${TARGET_SYS}/${includedir}/${QT_DIR_NAME}' >> $script | ||
20 | echo 'export OE_QMAKE_MOC=${SDKPATH}/bin/moc4' >> $script | ||
21 | echo 'export OE_QMAKE_UIC=${SDKPATH}/bin/uic4' >> $script | ||
22 | echo 'export OE_QMAKE_UIC3=${SDKPATH}/bin/uic34' >> $script | ||
23 | echo 'export OE_QMAKE_RCC=${SDKPATH}/bin/rcc4' >> $script | ||
24 | echo 'export OE_QMAKE_QDBUSCPP2XML=${SDKPATH}/bin/qdbuscpp2xml4' >> $script | ||
25 | 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 | ||
27 | 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 | } | ||
diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-host.bb b/meta/recipes-qt/tasks/task-qte-toolchain-host.bb new file mode 100644 index 0000000000..2ab6ccf6b9 --- /dev/null +++ b/meta/recipes-qt/tasks/task-qte-toolchain-host.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require recipes-core/tasks/task-sdk-host.bb | ||
2 | |||
3 | DESCRIPTION = "Host packages for Qt Embedded SDK" | ||
4 | LICENSE = "MIT" | ||
5 | ALLOW_EMPTY = "1" | ||
6 | |||
7 | RDEPENDS_${PN} += "qt4-tools-nativesdk" | ||
diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb b/meta/recipes-qt/tasks/task-qte-toolchain-target.bb new file mode 100644 index 0000000000..98fe47794f --- /dev/null +++ b/meta/recipes-qt/tasks/task-qte-toolchain-target.bb | |||
@@ -0,0 +1,35 @@ | |||
1 | DESCRIPTION = "Target packages for Qt Embedded SDK" | ||
2 | LICENSE = "MIT" | ||
3 | ALLOW_EMPTY = "1" | ||
4 | |||
5 | PR = "r5" | ||
6 | |||
7 | LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | ||
8 | file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
9 | |||
10 | RDEPENDS_${PN} += " \ | ||
11 | task-poky-standalone-sdk-target \ | ||
12 | qt4-embedded-mkspecs \ | ||
13 | libqt-embeddedmultimedia4-dev \ | ||
14 | libqt-embeddedphonon4-dev \ | ||
15 | libqt-embedded3support4-dev \ | ||
16 | libqt-embeddedclucene4-dev \ | ||
17 | libqt-embeddedcore4-dev \ | ||
18 | libqt-embeddeddbus4-dev \ | ||
19 | libqt-embeddeddesignercomponents4-dev \ | ||
20 | libqt-embeddeddesigner4-dev \ | ||
21 | libqt-embeddeduitools4-dev \ | ||
22 | libqt-embeddedgui4-dev \ | ||
23 | libqt-embeddedhelp4-dev \ | ||
24 | libqt-embeddednetwork4-dev \ | ||
25 | libqt-embeddedscript4-dev \ | ||
26 | libqt-embeddedscripttools4-dev \ | ||
27 | libqt-embeddedsql4-dev \ | ||
28 | libqt-embeddedsvg4-dev \ | ||
29 | libqt-embeddedtest4-dev \ | ||
30 | libqt-embeddedwebkit4-dev \ | ||
31 | libqt-embeddedxml4-dev \ | ||
32 | libsqlite3-dev \ | ||
33 | expat-dev \ | ||
34 | " | ||
35 | |||