diff options
author | Wenzong Fan <wenzong.fan@windriver.com> | 2012-08-02 09:43:02 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-02 15:28:38 +0100 |
commit | 1b138d167cefdcbcc969e4f9d2639cdc647945d7 (patch) | |
tree | 5bcf879abfd3762372d3549d2d0280f087a054e5 /meta/recipes-qt/qt4/qt4-native.inc | |
parent | 438df0f1d0c5d986ef67eaf57de9a0f5fef2d7e0 (diff) | |
download | poky-1b138d167cefdcbcc969e4f9d2639cdc647945d7.tar.gz |
qt4: fix qt4-native build failure on SLED-11
This issue is that with C++ compiler process an old version of kernel
header file, coincidently that file has a variable named 'new':
* 'embedded/qkbdtty_qws.cpp' include 'linux/vt.h';
* '/usr/include/linux/vt.h' has below code on SLED-11.x:
+ unsigned int new;
On mostly hosts it has been changed to: new -> newev.
[YOCTO #2845]
(From OE-Core rev: bb4b71552da0d1f4396955f35db5819f88a7d2ae)
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-native.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-native.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc index 70adec40fc..90ea63c950 100644 --- a/meta/recipes-qt/qt4/qt4-native.inc +++ b/meta/recipes-qt/qt4/qt4-native.inc | |||
@@ -9,14 +9,16 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ | |||
9 | file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ | 9 | file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ |
10 | file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" | 10 | file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" |
11 | 11 | ||
12 | INC_PR = "r14" | 12 | INC_PR = "r15" |
13 | 13 | ||
14 | inherit native | 14 | inherit native |
15 | 15 | ||
16 | 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 \ |
17 | file://qt-config.patch \ | 17 | file://qt-config.patch \ |
18 | file://g++.conf \ | 18 | file://g++.conf \ |
19 | file://linux.conf" | 19 | file://linux.conf \ |
20 | file://fix_qkbdtty_qws.patch \ | ||
21 | " | ||
20 | S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" | 22 | S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" |
21 | 23 | ||
22 | EXTRA_OECONF = "-prefix ${prefix} \ | 24 | EXTRA_OECONF = "-prefix ${prefix} \ |