diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-01-08 01:12:07 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-11 23:26:32 +0000 |
commit | 928ceb67cfe213b1eed0e392c1a319bcfa3068c7 (patch) | |
tree | 8e84522f4c1c9cfc3190ee0494359d19ae659158 /meta/recipes-qt | |
parent | c4a3258c2c9c81ebacf6dc99a93b91415d78f0b9 (diff) | |
download | poky-928ceb67cfe213b1eed0e392c1a319bcfa3068c7.tar.gz |
qt4: fix-for-mips-n32.patch: remove it
Not needed it any more since qt4 has been moved to meta-qt4.
(From OE-Core rev: dfb0832d7b2821ecb99fc543351a414933bc9d89)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.7/fix-for-mips-n32.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/fix-for-mips-n32.patch b/meta/recipes-qt/qt4/qt4-4.8.7/fix-for-mips-n32.patch deleted file mode 100644 index 9f90b78fad..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.7/fix-for-mips-n32.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From 269b1a82e654d9b8d682d861b4d0db0bd50d3106 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Fri, 27 Nov 2015 03:09:07 +0000 | ||
4 | Subject: [PATCH] wtf/Platform.h: fix build for mips n32 | ||
5 | |||
6 | If _ABIN32 is defined, it should go into 32 bit branch. | ||
7 | |||
8 | Fixed: | ||
9 | ./wtf/StdLibExtras.h: In instantiation of 'TO WTF::bitwise_cast(FROM) [with TO = int; FROM = double]': | ||
10 | runtime/JSValueInlineMethods.h:495:44: required from here | ||
11 | ./wtf/Assertions.h:326:47: error: size of array is negative | ||
12 | #define COMPILE_ASSERT(exp, name) typedef int dummy##name [(exp) ? 1 : -1] | ||
13 | |||
14 | https://bugreports.qt.io/browse/QTBUG-39224 | ||
15 | |||
16 | Upstream-Status: Submitted | ||
17 | |||
18 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
19 | --- | ||
20 | src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h | ||
24 | index e8b03be..dfc6a74 100644 | ||
25 | --- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h | ||
26 | +++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h | ||
27 | @@ -147,7 +147,7 @@ | ||
28 | /* CPU(MIPS) - MIPS 32-bit and 64-bit */ | ||
29 | #if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) \ | ||
30 | || defined(__mips64)) | ||
31 | -#if defined(__mips64) | ||
32 | +#if defined(__mips64) && !defined(_ABIN32) | ||
33 | #define WTF_CPU_MIPS64 1 | ||
34 | #define WTF_MIPS_ARCH __mips64 | ||
35 | #else | ||
36 | -- | ||
37 | 2.5.0 | ||
38 | |||