[SCM] qtbase packaging branch, master, updated. debian/5.9.1+dfsg-8-3-g2eae930

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 2eae9303932cc5616312577431d754735d46586b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Aug 20 14:51:10 2017 +0300

    Stop using the gold linker on all architectures, because of bug #852035.
---
 debian/changelog | 3 +++
 debian/rules     | 6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa6331f..2e3b571 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qtbase-opensource-src (5.9.1+dfsg-9) UNRELEASED; urgency=medium
   * Remove missing symbol in libqt5network5.symbols. I clearly missed it while
     editing them.
 
+  [ Dmitry Shachnev ]
+  * Stop using the gold linker on all architectures, because of bug #852035.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 16 Aug 2017 09:41:57 -0300
 
 qtbase-opensource-src (5.9.1+dfsg-8) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 215f28e..da83611 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,11 +39,6 @@ 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.
@@ -121,6 +116,7 @@ override_dh_auto_configure:
 	            -accessibility \
 	            -compile-examples \
 	            -no-directfb \
+	            -no-use-gold-linker \
 	            $(extra_configure_opts) \
 	            $(cpu_opt) \
 	            QMAKE_CFLAGS="$(CFLAGS)" \

-- 
qtbase packaging