qt5-qtwebengine/qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch
Kevin Kofler 593264c716 arm-fpu-fix patch: Also build the host tools (i.e., GN) with the correct FPU
* Tue Jun 13 2017 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.9.0-2
- arm-fpu-fix patch: Also build the host tools (i.e., GN) with the correct FPU

This ensures GN does not get built with NEON on 32-bit armv7hl. The ARM
builders don't necessarily support NEON. (The Fedora one apparently
does, but the RPM Fusion one apparently does not.)
2017-06-13 14:54:02 +02:00

21 lines
989 B
Diff

diff -ur qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri qtwebengine-opensource-src-5.9.0-arm-fpu-fix/src/core/config/linux.pri
--- qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri 2017-05-19 06:22:04.000000000 +0200
+++ qtwebengine-opensource-src-5.9.0-arm-fpu-fix/src/core/config/linux.pri 2017-06-13 14:51:26.986633933 +0200
@@ -41,7 +41,7 @@
!isEmpty(TOOLCHAIN_SYSROOT): gn_args += target_sysroot=\"$${TOOLCHAIN_SYSROOT}\"
}
-contains(QT_ARCH, "arm"):!host_build {
+contains(QT_ARCH, "arm") {
# Extract ARM specific compiler options that we have to pass to gn,
# but let gn figure out a default if an option is not present.
MTUNE = $$extractCFlag("-mtune=.*")
@@ -64,6 +64,7 @@
gn_args += arm_use_neon=true
} else {
MFPU = $$extractCFlag("-mfpu=.*")
+ !isEmpty(MFPU): gn_args += arm_fpu=\"$$MFPU\"
!isEmpty(MFPU):contains(MFPU, ".*neon.*") {
gn_args += arm_use_neon=true
} else {