diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-01-21 15:38:29 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-01 15:57:26 +0000 |
commit | c5998e6def9b320eb50247765b096743f6efbfe8 (patch) | |
tree | fde827d88e0afb56b10a43ace0a24c7de1d40b26 /meta/recipes-qt/qt4/qt-4.6.3.inc | |
parent | 70ce04977c9d752430f9a01a01d6db5bf501ba42 (diff) | |
download | poky-c5998e6def9b320eb50247765b096743f6efbfe8.tar.gz |
qt4: Bring in improvements from meta-openembedded
Differences from meta-openembedded version:
* SRC_URI and S now come from qt-${PV}.inc since these are version specific
* Source checksums are also now in qt-${PV}.inc
* Remove do_compile as this is handled in qt-${PV}.inc
* Move contents of do_install_append from qt-${PV}.inc to do_install in
qt4.inc as this is the same for 4.6.3 and 4.7.1 and will get in the way of
do_install_append in qt-embedded.inc.
* Don't enable PostgreSQL, MySQL or SQLite 2.x plugins as we don't currently
have recipes for these DBMSs in Poky. These can be re-enabled easily when
or if we do.
* Use INC_PR in qt4-x11-free_4.6.3.bb
* Don't always specify -embedded config option in qt4.inc
* Don't add qte.sh to SRC_URI in qt-4.6.3.inc (this is embedded-specific)
Differences from what we have currently in Poky (plus the above):
* Set DESCRIPTION based on embedded/X11
* Move out arch-specific settings to qt4-arch.inc
* Add qt4x11.bbclass which can be inherited by application recipes to select
the X11 version (this makes more sense once the embedded version is added).
* Update HOMEPAGE
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.6.3.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.6.3.inc | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.6.3.inc b/meta/recipes-qt/qt4/qt-4.6.3.inc index 155af66b89..ec2c9208d5 100644 --- a/meta/recipes-qt/qt4/qt-4.6.3.inc +++ b/meta/recipes-qt/qt4/qt-4.6.3.inc | |||
@@ -19,6 +19,9 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}. | |||
19 | file://mips-relocate.patch \ | 19 | file://mips-relocate.patch \ |
20 | " | 20 | " |
21 | 21 | ||
22 | SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072" | ||
23 | SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768" | ||
24 | |||
22 | S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" | 25 | S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" |
23 | 26 | ||
24 | do_configure_prepend() { | 27 | do_configure_prepend() { |
@@ -40,7 +43,7 @@ do_configure_append() { | |||
40 | } | 43 | } |
41 | 44 | ||
42 | QT_GLFLAGS ?= "" | 45 | QT_GLFLAGS ?= "" |
43 | QT_CONFIG_FLAGS += " -no-rpath -qt3support -silent ${QT_GLFLAGS}" | 46 | QT_CONFIG_FLAGS += " -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}" |
44 | 47 | ||
45 | do_compile() { | 48 | do_compile() { |
46 | # Fixup missing wsegl header in some SGX SDKs | 49 | # Fixup missing wsegl header in some SGX SDKs |
@@ -51,16 +54,3 @@ do_compile() { | |||
51 | unset CFLAGS CXXFLAGS | 54 | unset CFLAGS CXXFLAGS |
52 | oe_runmake ${EXTRA_ENV} | 55 | oe_runmake ${EXTRA_ENV} |
53 | } | 56 | } |
54 | |||
55 | do_install_append() { | ||
56 | install -d ${D}${bindir} | ||
57 | for i in rcc uic moc ; do | ||
58 | install -m 0755 ${S}/bin/$i ${D}${bindir}/ | ||
59 | done | ||
60 | |||
61 | #Append an E to the qtdemo file | ||
62 | if [ -n "${QT_LIBINFIX}" ] ; then | ||
63 | mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} | ||
64 | fi | ||
65 | } | ||
66 | |||