diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-01-03 13:41:33 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-04 12:08:31 +0000 |
commit | 670706d1d3e3b16636818584fec0441f70b793d9 (patch) | |
tree | c732b65f9e5049fb5694cdbe648f08f262f5e911 /meta/recipes-qt/qt4/qt-4.8.0.inc | |
parent | 99a6e1a3a453c17575439723599da6bef62175bb (diff) | |
download | poky-670706d1d3e3b16636818584fec0441f70b793d9.tar.gz |
qt4: add version 4.8.0
Version 4.8.0 makes a few minor changes in the internal build system -
the following issues had to be worked around:
* The -qt-gif configure option has been removed. This is actually the
default and has been for some time, so remove it from qt4.inc.
* The mkspecs have been refactored requiring us to copy our g++.conf
file over the top of g++-unix.conf instead. Some modifications to this
file were also necessary to remove some settings that are now in other
conf files (and we don't modify those values in any case).
* The LD environment variable needs to be unset during configure, or
else the configure script overrides our value of QMAKE_LINK which
selects ${CXX} as our linker.
* QMAKE_CXX contains a reference to OE_QMAKE_CXX which the configure
script does not expect and cannot expand and this results in webkit
being disabled, so add a workaround for this.
(From OE-Core rev: 6b2a5d15ad20573502142b635e6cab9bcfb3b40a)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.8.0.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.0.inc | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.0.inc b/meta/recipes-qt/qt4/qt-4.8.0.inc new file mode 100644 index 0000000000..2addbb211f --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.0.inc | |||
@@ -0,0 +1,61 @@ | |||
1 | LICENSE = "LGPLv2.1 | GPLv3" | ||
2 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ | ||
3 | file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ | ||
4 | file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" | ||
5 | |||
6 | FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:" | ||
7 | |||
8 | SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ | ||
9 | file://0004-no-qmake.patch \ | ||
10 | file://hack-out-pg2-4.7.0.patch \ | ||
11 | file://0006-freetype-host-includes.patch \ | ||
12 | file://0009-support-2bpp.patch \ | ||
13 | file://0001-Added-Openembedded-crossarch-option.patch \ | ||
14 | file://fix-translations.patch \ | ||
15 | file://add_nostrip_for_debug_packages.diff \ | ||
16 | file://qmake_cxx_eval.patch \ | ||
17 | file://g++.conf \ | ||
18 | file://linux.conf \ | ||
19 | " | ||
20 | |||
21 | SRC_URI[md5sum] = "e8a5fdbeba2927c948d9f477a6abe904" | ||
22 | SRC_URI[sha256sum] = "9392b74e485e15f75a3e07a527547d4f6747eaf55ebce71ba0e863a9fd320b6e" | ||
23 | |||
24 | S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" | ||
25 | |||
26 | FILES_${QT_BASE_NAME}-tools_append = " ${bindir}/qml ${bindir}/qmlplugindump" | ||
27 | FILES_${QT_BASE_NAME}-tools-dbg_append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump" | ||
28 | |||
29 | PACKAGES_append = " ${QT_BASE_NAME}-tests-dbg ${QT_BASE_NAME}-tests" | ||
30 | FILES_${QT_BASE_NAME}-tests-dbg = "/usr/tests/qt4/*/.debug" | ||
31 | FILES_${QT_BASE_NAME}-tests = "/usr/tests/qt4/*" | ||
32 | |||
33 | do_configure_prepend() { | ||
34 | for pro in $(find ${S} -name "*.pro") ; do | ||
35 | sed -i \ | ||
36 | -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \ | ||
37 | -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro | ||
38 | done | ||
39 | |||
40 | sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf | ||
41 | sed -i \ | ||
42 | -e /QMAKE_MOC\ /d \ | ||
43 | -e /QMAKE_UIC\ /d \ | ||
44 | -e /QMAKE_UIC3\ /d \ | ||
45 | -e /QMAKE_RCC\ /d \ | ||
46 | ${S}/configure | ||
47 | |||
48 | # Avoid problems with Qt 4.8.0 configure setting QMAKE_LINK from LD (since we want the linker to be g++) | ||
49 | unset LD | ||
50 | } | ||
51 | |||
52 | do_compile() { | ||
53 | # Fixup missing wsegl header in some SGX SDKs | ||
54 | if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then | ||
55 | cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/ | ||
56 | fi | ||
57 | |||
58 | unset CFLAGS CXXFLAGS | ||
59 | |||
60 | oe_runmake ${EXTRA_ENV} | ||
61 | } | ||