NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/qt5: enable for xtensa

Browse Source 
Add upstream patch to fix double-conversion compile for xtensa
and drop dependency on !BR_xtensa.

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Peter Seiderer 2020-03-10 09:19:00 +01:00 committed by Thomas Petazzoni
parent 572e371f3c
commit 572b25c0d4
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/qt5/Config.in
View File

@ -13,7 +13,7 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
comment "Qt5 needs a toolchain w/ gcc >= 4.8, wchar, NPTL, C++, dynamic library"
depends on !BR2_ARM_CPU_ARMV4
depends on !BR2_arc && !BR2_xtensa
depends on !BR2_arc
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
@ -26,7 +26,7 @@ menuconfig BR2_PACKAGE_QT5
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+
# no built-in double-conversion support
depends on !BR2_arc && !BR2_xtensa
depends on !BR2_arc
depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_QT5BASE
help

27
package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch Normal file
View File

@ -0,0 +1,27 @@
From cfac9a39658906b06f28208ee1d129f042760416 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Tue, 10 Mar 2020 09:01:31 +0100
Subject: [PATCH] double-conversion: enable for xtensa
[Upstream: https://github.com/google/double-conversion/commit/a54561be5588ac9b16d3c20760b9b554168bb8aa]
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
.../double-conversion/include/double-conversion/utils.h | 2 +-
1 file changed, 1 insertion(+), 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 55ca5bf5..95b08a4e 100644
--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h
+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h
@@ -96,7 +96,7 @@ int main(int argc, char** argv) {
defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \
defined(__riscv) || defined(__EMSCRIPTEN__) || \
defined(__or1k__) || \
- defined(__microblaze__)
+ defined(__microblaze__) || defined(__XTENSA__)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(__mc68000__) || \
defined(__pnacl__) || defined(__native_client__)
--
2.25.1