qt4: fix qt4-native build failure on SLED-11
v2 cover qt4: fix qt4-native build failure on SLED-11
From: Wenzong Fan <[email protected]>
v2 update:
Add description and signed-off-by to inner patch.
The following changes since commit 62d42fe3cfa575cb97b484ccf7b2e9a25cc50770:
tiny-init: Setup /dev/ptmx in init (2012-08-01 23:11:18 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib wenzong/2845
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/2845
Wenzong Fan (1):
qt4: fix qt4-native build failure on SLED-11
meta/recipes-qt/qt4/files/fix_qkbdtty_qws.patch | 37 +++++++++++++++++++++++ meta/recipes-qt/qt4/qt4-native.inc | 6 ++-- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-qt/qt4/files/fix_qkbdtty_qws.patch
Signature · 1 line
1.7.9.5
PATCH v2 1/1 qt4: fix qt4-native build failure on SLED-11
From: Wenzong Fan <[email protected]>
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]
--- meta/recipes-qt/qt4/files/fix_qkbdtty_qws.patch | 37 +++++++++++++++++++++++ meta/recipes-qt/qt4/qt4-native.inc | 6 ++-- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-qt/qt4/files/fix_qkbdtty_qws.patch
meta/recipes-qt/qt4/files/fix_qkbdtty_qws.patch new file +37 -0
@@ -0,0 +1,37 @@ +Upstream-Status: Pending + +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. + +Signed-off-by: Wenzong Fan <[email protected]> +======================================= +diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp +--- a/src/gui/embedded/qkbdtty_qws.cpp 2012-07-27 13:16:58.420198350 +0800 ++++ b/src/gui/embedded/qkbdtty_qws.cpp 2012-07-27 13:24:43.924191127 +0800 +@@ -54,8 +54,20 @@ + + #if defined Q_OS_LINUX + # include <linux/kd.h> ++ ++/* Workaround kernel headers using "new" as variable name. The problem ++ is specific to SLED-11, other distros use "newev" rather than "new" */ ++#ifdef __cplusplus ++#warning "workaround kernel headers using new as variable name on SLED 11" ++#define new newev ++#endif ++ + # include <linux/vt.h> //TODO: move vt handling somewhere else (QLinuxFbScreen?) + ++#ifdef __cplusplus ++#undef new ++#endif ++ + # include "qscreen_qws.h" + # include "qwindowsystem_qws.h" + # include "qapplication.h"
meta/recipes-qt/qt4/qt4-native.inc +4 -2
@@ -9,14 +9,16 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" -INC_PR = "r14" +INC_PR = "r15" inherit native SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ file://qt-config.patch \ file://g++.conf \ - file://linux.conf" + file://linux.conf \ + file://fix_qkbdtty_qws.patch \ + " S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" EXTRA_OECONF = "-prefix ${prefix} \
Signature · 1 line
1.7.9.5