Skip to contentSkip to conversation

qt5webkit: disable for MIPS soft-float

PATCH New Vicente Olivert Riera 2 participants 2 messages Feb 22, 2017 – Feb 23, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qt5webkit: disable for MIPS soft-float

It assumes the MIPS target has an FPU and uses FPU assembler instructions which cause the compilation to fail when building it for soft-float.

Fixes:
http://autobuild.buildroot.net/results/f40/f407ca9245e2445619420a9dfd595856729a2b2b/

---
 package/qt-webkit-kiosk/Config.in | 1 +
 package/qt5/qt5webkit/Config.in   | 1 +
 2 files changed, 2 insertions(+)
package/qt-webkit-kiosk/Config.in +1 -0
index 32952d7..1b0e0de 100644
@@ -9,6 +9,7 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK
 	depends on !BR2_STATIC_LIBS # qt5webkit
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5webkit
 	depends on !BR2_BINFMT_FLAT # qt5webkit
+	depends on !BR2_MIPS_SOFT_FLOAT # qt5webkit
 	help
 	  Simple kiosk-mode browser powered by Qt5Webkit
 
package/qt5/qt5webkit/Config.in +1 -0
index e9c11fb..4613550 100644
@@ -9,6 +9,7 @@ config BR2_PACKAGE_QT5WEBKIT
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	depends on !BR2_BINFMT_FLAT # icu
+	depends on !BR2_MIPS_SOFT_FLOAT
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
Signature · 1 line
2.10.2
#1 lore raw

PATCH 1/1 qt5webkit: disable for MIPS soft-float

Hello,

package/qt5/qt5webkit/Config.in config BR2_PACKAGE_QT5WEBKIT · line 12

Quoted 9 lines · Vicente Olivert Riera
package/qt5/qt5webkit/Config.in +1 -0
index e9c11fb..4613550 100644
@@ -9,6 +9,7 @@ config BR2_PACKAGE_QT5WEBKIT
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	depends on !BR2_BINFMT_FLAT # icu
+	depends on !BR2_MIPS_SOFT_FLOAT

I've added a comment above this line to explain why this dependency exists.

package/qt5/qt5webkit/Config.in config BR2_PACKAGE_QT5WEBKIT · line 15

Quoted 3 lines
package/qt5/qt5webkit/Config.in +0 -0
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.

And I've propagated the dependency to the Config.in comment in this file.

Applied to master with those two issues fixed. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com