[SCM] qtbase packaging branch, experimental, updated. debian/5.7.1-20161021+dfsg-1-3-g3a7daa8

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=3a7daa8

The following commit has been merged in the experimental branch:
commit 3a7daa8f0e96f88c015c8847f1060c88d0880b69
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Oct 28 15:39:13 2016 +0300

    Configure with -no-use-gold-linker on i386.
    
    To work around build failures of qtscript and qtgraphicaleffects.
    See binutils bug #842304.
---
 debian/changelog | 2 ++
 debian/rules     | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a93aa97..cf0b0ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qtbase-opensource-src (5.7.1~20161021+dfsg-2) UNRELEASED; urgency=medium
   * Backport two patches to add proper support for XDG_CONFIG_DIRS to
     QSettings; needed for LXQt transition (qsettings_simplify_logic.diff,
     qsettings_XDG_CONFIG_DIRS.diff).
+  * Configure with -no-use-gold-linker on i386 to work around build failures
+    of qtscript and qtgraphicaleffects (see binutils bug #842304).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Oct 2016 15:16:26 +0300
 
diff --git a/debian/rules b/debian/rules
index 434624d..2a9a796 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,6 +59,11 @@ ifneq ($(DEB_HOST_ARCH_OS),$(findstring $(DEB_HOST_ARCH_OS), linux kfreebsd))
 	extra_configure_opts += -no-eglfs
 endif
 
+# https://bugs.debian.org/842304
+ifeq ($(DEB_HOST_ARCH),i386)
+	extra_configure_opts += -no-use-gold-linker
+endif
+
 # Compile without sse2 support on i386
 # Do not use pre compiled headers in order to be able to rebuild the gui
 # submodule.

-- 
qtbase packaging