From 593264c7166a67d1fec08f947ace5e5636129ff5 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 13 Jun 2017 14:54:02 +0200 Subject: [PATCH] arm-fpu-fix patch: Also build the host tools (i.e., GN) with the correct FPU * Tue Jun 13 2017 Kevin Kofler - 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.) --- qt5-qtwebengine.spec | 5 ++++- qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 9bd1ec1..5264934 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -41,7 +41,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.9.0 -Release: 1%{?dist} +Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -557,6 +557,9 @@ done %changelog +* Tue Jun 13 2017 Kevin Kofler - 5.9.0-2 +- arm-fpu-fix patch: Also build the host tools (i.e., GN) with the correct FPU + * Mon Jun 12 2017 Kevin Kofler - 5.9.0-1 - Update to 5.9.0 - Update version numbers of bundled stuff diff --git a/qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch b/qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch index ddf8abc..ca308d4 100644 --- a/qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch +++ b/qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch @@ -1,6 +1,15 @@ 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-10 02:32:09.984692943 +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 {