[SCM] qtwebengine packaging branch, experimental, updated. debian/5.9.1+dfsg-1-4-g06d4f97

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebengine.git;a=commitdiff;h=06d4f97

The following commit has been merged in the experimental branch:
commit 06d4f976518d57c09f4f5b88ca740de65287a920
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jul 20 19:46:13 2017 +0300

    Add a patch to apply ARM compiler options even on host builds.
    
    To make sure NEON is not used for gn bootstrap.
---
 debian/changelog                   |  2 ++
 debian/patches/armhf-options.patch | 18 ++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 65916f9..b3c7751 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qtwebengine-opensource-src (5.9.1+dfsg-2) UNRELEASED; urgency=medium
     files now include it as dependency.
   * Add a patch to print compiler commands when bootstrapping gn. This helps
     us discover wrong compiler flags, such as using -mfpu=neon on armhf.
+  * Add a patch to apply ARM compiler options even on host builds, to make
+    sure NEON is not used for gn bootstrap.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 18 Jul 2017 15:57:05 +0300
 
diff --git a/debian/patches/armhf-options.patch b/debian/patches/armhf-options.patch
new file mode 100644
index 0000000..796679f
--- /dev/null
+++ b/debian/patches/armhf-options.patch
@@ -0,0 +1,18 @@
+Description: apply ARM options on host builds too
+ Is is needed to make sure NEON is not used on Debian armhf.
+ This partially reverts upstream commit f0fc1606d5b6d2ad.
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: no
+Last-Update: 2017-07-20
+
+--- a/src/core/config/linux.pri
++++ b/src/core/config/linux.pri
+@@ -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=.*")
diff --git a/debian/patches/series b/debian/patches/series
index 6f52751..50e90dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ no-icudtl-dat.patch
 disable-last_commit_position.patch
 add_mips_support.patch
 verbose-gn-bootstrap.patch
+armhf-options.patch

-- 
qtwebengine packaging