[SCM] qtbase packaging branch, experimental, updated. debian/5.9.1+dfsg-3-2-gcb8ed97

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit cb8ed971ba6b08c5fdf74ab867676721226045d0
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jul 5 12:39:11 2017 +0300

    Revert "Drop the workaround to not use gold on i386."
    
    See https://bugs.debian.org/842304#33.
    
    This reverts commit 64a5d5d5479bfec15e8f047dbb75e288d5796dd4.
---
 debian/changelog | 3 +++
 debian/rules     | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0be224d..8ee9a11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.9.1+dfsg-4) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Revert dropping the workaround to not use gold on i386.
+    See https://bugs.debian.org/842304#33.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 05 Jul 2017 12:37:13 +0300
 
diff --git a/debian/rules b/debian/rules
index dfa3a0f..05e313b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,6 +39,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