diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-04-30 14:19:54 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-03 15:48:09 +0100 |
commit | 1cd72bd13244c472e383060fff0d7d1901b77475 (patch) | |
tree | 2834fdc6e3d8a74da395d4cbea224102919a4eff /meta/recipes-qt/qt4/qt-4.8.1 | |
parent | c9e9d8baf4f93909edbd97873695449c0c03337f (diff) | |
download | poky-1cd72bd13244c472e383060fff0d7d1901b77475.tar.gz |
qt4: fix compilation issue
gcc 4.7 uncovers a type mismatch in the code. And this commit fixes the issue:
| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7: error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive]
| In file included from ./wtf/Platform.h:1217:0,
| from ./config.h:30,
| from wtf/gobject/GOwnPtr.cpp:19:
| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously declared here
NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed
(From OE-Core rev: 1923455340fca5e4b68a2c3ac3566a99baa93cd9)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.8.1')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch b/meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch new file mode 100644 index 0000000000..81245059c0 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | This patch fixes the type mismatch fixing this compile issue: | ||
4 | |||
5 | | /srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7: error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive] | ||
6 | | In file included from ./wtf/Platform.h:1217:0, | ||
7 | | from ./config.h:30, | ||
8 | | from wtf/gobject/GOwnPtr.cpp:19: | ||
9 | | wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously declared here | ||
10 | NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed | ||
11 | |||
12 | |||
13 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
14 | 2012/04/30 | ||
15 | |||
16 | |||
17 | Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h | ||
18 | =================================================================== | ||
19 | --- qt-everywhere-opensource-src-4.8.1/src/3rdparty.orig/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h | ||
20 | +++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h | ||
21 | @@ -52,7 +52,7 @@ typedef struct _GFile GFile; | ||
22 | typedef struct _GHashTable GHashTable; | ||
23 | typedef struct _GInputStream GInputStream; | ||
24 | typedef struct _GList GList; | ||
25 | -typedef struct _GMutex GMutex; | ||
26 | +typedef union _GMutex GMutex; | ||
27 | typedef struct _GPatternSpec GPatternSpec; | ||
28 | typedef struct _GPollableOutputStream GPollableOutputStream; | ||
29 | typedef struct _GSocketClient GSocketClient; | ||