diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-01-21 16:15:03 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-01 16:14:01 +0000 |
commit | abb87d455d75be6ae05b3124b98a43ccfc90f453 (patch) | |
tree | 8b6b8a6b98c40653e3d445be28f2add90baa8d3b /meta/recipes-qt/qt4/qt4-tools-native.inc | |
parent | 51b50818922a1be99f50cc1e3386ca914c025427 (diff) | |
download | poky-abb87d455d75be6ae05b3124b98a43ccfc90f453.tar.gz |
qt4-tools-native: update from OpenEmbedded
Differences from OE version:
* Add source checksums
* Correct LICENCE and move to .inc file
* Update HOMEPAGE
* Don't specify DEFAULT_PREFERENCE
* Remove S and SRC_URI from 4.7.1 (duplicates of .inc file values)
* Use http source URL to match other Qt4 recipes
* Don't add back tools previously disabled in poky
Differences from current (plus the above):
* Add Qt 4.7.1 recipe
* Specify -embedded to remove dependency on X (as we are only building tools)
* Disable some other options to reduce dependencies
* Specify -no-freetype / -no-fontconfig in .inc file rather than in .bb
* Use INC_PR
* Whitespace fixes
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-tools-native.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-tools-native.inc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/meta/recipes-qt/qt4/qt4-tools-native.inc b/meta/recipes-qt/qt4/qt4-tools-native.inc index 6dca218578..0c4d2c7760 100644 --- a/meta/recipes-qt/qt4/qt4-tools-native.inc +++ b/meta/recipes-qt/qt4/qt4-tools-native.inc | |||
@@ -1,9 +1,16 @@ | |||
1 | DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x" | 1 | DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x" |
2 | DEPENDS = "zlib-native dbus-native libsm-native" | 2 | DEPENDS = "zlib-native dbus-native" |
3 | SECTION = "libs" | 3 | SECTION = "libs" |
4 | HOMEPAGE = "http://qt.nokia.com" | 4 | HOMEPAGE = "http://qt.nokia.com" |
5 | PRIORITY = "optional" | 5 | PRIORITY = "optional" |
6 | 6 | ||
7 | LICENSE = "LGPLv2.1 | GPLv3" | ||
8 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ | ||
9 | file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ | ||
10 | file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" | ||
11 | |||
12 | INC_PR = "r11" | ||
13 | |||
7 | inherit native | 14 | inherit native |
8 | 15 | ||
9 | SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ | 16 | SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ |
@@ -16,13 +23,14 @@ EXTRA_OECONF = "-prefix ${prefix} \ | |||
16 | -L ${STAGING_LIBDIR_NATIVE} \ | 23 | -L ${STAGING_LIBDIR_NATIVE} \ |
17 | -I ${STAGING_INCDIR_NATIVE} \ | 24 | -I ${STAGING_INCDIR_NATIVE} \ |
18 | -qt-libjpeg -qt-gif -system-zlib \ | 25 | -qt-libjpeg -qt-gif -system-zlib \ |
19 | -no-libjpeg -no-libpng \ | 26 | -no-libjpeg -no-libpng -no-libmng -no-libtiff \ |
20 | -no-accessibility \ | 27 | -no-accessibility \ |
21 | -no-cups \ | 28 | -no-cups \ |
22 | -no-exceptions \ | 29 | -no-exceptions \ |
23 | -no-nas-sound \ | 30 | -no-nas-sound \ |
24 | -no-nis \ | 31 | -no-nis -no-openssl \ |
25 | -verbose -release -static \ | 32 | -verbose -release -static \ |
33 | -embedded -no-freetype -no-glib -no-iconv \ | ||
26 | -qt3support" | 34 | -qt3support" |
27 | 35 | ||
28 | # yank default -e, otherwise we get the following error: | 36 | # yank default -e, otherwise we get the following error: |
@@ -59,7 +67,7 @@ do_install() { | |||
59 | for i in moc uic rcc lrelease lupdate; do | 67 | for i in moc uic rcc lrelease lupdate; do |
60 | install -m 0755 bin/${i} ${D}${bindir}/${i}4 | 68 | install -m 0755 bin/${i} ${D}${bindir}/${i}4 |
61 | done | 69 | done |
62 | 70 | ||
63 | install -d ${D}${datadir}/qt4/ | 71 | install -d ${D}${datadir}/qt4/ |
64 | cp -PfR mkspecs ${D}${datadir}/qt4/ | 72 | cp -PfR mkspecs ${D}${datadir}/qt4/ |
65 | ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++ | 73 | ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++ |