mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-07 05:02:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt4-4.8.7: fix build for mips n32

Browse Source 
Issue: LIN8-1720

If _ABIN32 is defined, it should go into 32 bit branch.

Fixed:
./wtf/StdLibExtras.h: In instantiation of 'TO WTF::bitwise_cast(FROM) [with TO = int; FROM = double]':
runtime/JSValueInlineMethods.h:495:44:   required from here
./wtf/Assertions.h:326:47: error: size of array is negative
 #define COMPILE_ASSERT(exp, name) typedef int dummy##name [(exp) ? 1 : -1]

(LOCAL REV: NOT UPSTREAM) -- Sent to oe-core on 20151127

(From OE-Core rev: 12c3982f4845929c0d0a1324cff4edbfb4cf59a7)

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>
This commit is contained in:
Robert Yang
2015-11-26 19:35:19 -08:00
committed by Richard Purdie
parent f1e8938298
commit 6decbbb155
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta/recipes-qt/qt4/qt4-4.8.7.inc
View File

@@ -29,6 +29,7 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
file://add_check_for_aarch64_32.patch \
file://g++.conf \
file://linux.conf \
file://fix-for-mips-n32.patch \
"
SRC_URI[md5sum] = "d990ee66bf7ab0c785589776f35ba6ad"

38
meta/recipes-qt/qt4/qt4-4.8.7/fix-for-mips-n32.patch Normal file
View File

@@ -0,0 +1,38 @@
From 269b1a82e654d9b8d682d861b4d0db0bd50d3106 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Fri, 27 Nov 2015 03:09:07 +0000
Subject: [PATCH] wtf/Platform.h: fix build for mips n32
If _ABIN32 is defined, it should go into 32 bit branch.
Fixed:
./wtf/StdLibExtras.h: In instantiation of 'TO WTF::bitwise_cast(FROM) [with TO = int; FROM = double]':
runtime/JSValueInlineMethods.h:495:44: required from here
./wtf/Assertions.h:326:47: error: size of array is negative
#define COMPILE_ASSERT(exp, name) typedef int dummy##name [(exp) ? 1 : -1]
https://bugreports.qt.io/browse/QTBUG-39224
Upstream-Status: Submitted
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
index e8b03be..dfc6a74 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
@@ -147,7 +147,7 @@
/* CPU(MIPS) - MIPS 32-bit and 64-bit */
#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) \
|| defined(__mips64))
-#if defined(__mips64)
+#if defined(__mips64) && !defined(_ABIN32)
#define WTF_CPU_MIPS64 1
#define WTF_MIPS_ARCH __mips64
#else
--
2.5.0