68939011a0
Removed patches applied upstream: - package/qt5/qt5base/5.12.4/0005-Fix-dependency_libs-entry-of-.la-files.patch https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=commitdiff;h=8c0787cfa1a906ebe25907515d86050303b127e7 - package/qt5/qt5multimedia/5.12.4/0001-Fix-compile-issue-when-no-opengl-in-QVideoSurfacePainter.patch https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=commitdiff;h=8c0787cfa1a906ebe25907515d86050303b127e7 - package/qt5/qt5serialbus/5.12.4/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch https://code.qt.io/cgit/qt/qtserialbus.git/commit/?id=43d746c2c0c87c8694e835f3b052317c8fa02482 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
From 014958d2d17045dd63d93cb3061d1e40b15725b7 Mon Sep 17 00:00:00 2001
|
|
From: Peter Seiderer <ps.report@gmx.net>
|
|
Date: Tue, 21 Aug 2018 21:11:40 +0200
|
|
Subject: [PATCH] double-conversion: enable for microblaze
|
|
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
[Rebased for Qt5.12.0]
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
---
|
|
.../double-conversion/include/double-conversion/utils.h | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h
|
|
index 7622fe6162..d29de95094 100644
|
|
--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h
|
|
+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h
|
|
@@ -94,7 +94,8 @@ int main(int argc, char** argv) {
|
|
defined(_MIPS_ARCH_MIPS32R2) || \
|
|
defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \
|
|
defined(__riscv) || defined(__EMSCRIPTEN__) || \
|
|
- defined(__or1k__)
|
|
+ defined(__or1k__) || \
|
|
+ defined(__microblaze__)
|
|
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
|
|
#elif defined(__mc68000__) || \
|
|
defined(__pnacl__) || defined(__native_client__)
|
|
--
|
|
2.19.2
|
|
|