commit 12df33ef327db2288c418683639847f4e351bb1c
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Tue Jun 13 15:05:24 2017 +0200
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-freeworld.spec | 1 +
qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch | 11 ++++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index b4c5d38..2ad05da 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -416,6 +416,7 @@ echo "%{_libdir}/%{name}" \
- Backport patch to fix FTBFS with GCC on aarch64 from upstream Chromium
- Fix src/3rdparty/chromium/build/linux/unbundle/re2.gn
- Delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn
+- arm-fpu-fix patch: Also build the host tools (i.e., GN) with the correct FPU
* Sun Apr 30 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 5.8.0-4
- Rebuild for ffmpeg update
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 {
Show replies by date