diff options
author | Ken Werner <ken.werner@linaro.org> | 2012-04-27 12:59:17 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-30 11:37:28 +0100 |
commit | 69dc3c384ff91d1a5983b39a33fde23a8e711c5a (patch) | |
tree | 668c16cf4d2064c066603f6a439be3b92012384b /meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch | |
parent | e3bafe8ae13e61817ef5f5f095c7a7b9ab920c11 (diff) | |
download | poky-69dc3c384ff91d1a5983b39a33fde23a8e711c5a.tar.gz |
Qt 4.8 GCC 4.7 fixes
This change introduces two new patches to Qt 4.8. One prevents the build
system from using the -fuse-ld=gold GCC flag as this isn't upstream and
therefore not supported by many toolchains out there. The second patch
fixes a compile time error when using toolchains based on GCC 4.7.
(From OE-Core rev: c98d60923b84bcd285644cecaed1fa0455747a2f)
Signed-off-by: Ken Werner <ken.werner@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch b/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch new file mode 100644 index 0000000000..8252817af1 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Fix compile error when using toolchains based on GCC 4.7. | ||
2 | |||
3 | Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h | ||
4 | =================================================================== | ||
5 | --- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h | ||
6 | +++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h | ||
7 | @@ -57,9 +57,7 @@ namespace JSC { | ||
8 | |||
9 | class JSGlobalObject : public JSVariableObject { | ||
10 | protected: | ||
11 | - using JSVariableObject::JSVariableObjectData; | ||
12 | - | ||
13 | - struct JSGlobalObjectData : public JSVariableObjectData { | ||
14 | + struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { | ||
15 | // We use an explicit destructor function pointer instead of a | ||
16 | // virtual destructor because we want to avoid adding a vtable | ||
17 | // pointer to this struct. Adding a vtable pointer would force the | ||
18 | Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h | ||
19 | =================================================================== | ||
20 | --- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h | ||
21 | +++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h | ||
22 | @@ -32,8 +32,7 @@ namespace JSC{ | ||
23 | |||
24 | class JSStaticScopeObject : public JSVariableObject { | ||
25 | protected: | ||
26 | - using JSVariableObject::JSVariableObjectData; | ||
27 | - struct JSStaticScopeObjectData : public JSVariableObjectData { | ||
28 | + struct JSStaticScopeObjectData : public JSVariableObjectData::JSVariableObjectData { | ||
29 | JSStaticScopeObjectData() | ||
30 | : JSVariableObjectData(&symbolTable, ®isterStore + 1) | ||
31 | { | ||