[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.0+dfsg-1-264-g59c9a84

[Simon Quigley]

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

The following commit has been merged in the ubuntu+1 branch:
commit 59c9a840b32ba00ec8aab35e2fd44de43b68859d
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Thu Jun 15 09:49:26 2017 -0500

    Simplify disabling of gold linker in debian/rules.
---
 debian/changelog | 1 +
 debian/rules     | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68ec94f..98bd68b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ qtbase-opensource-src (5.9.0+dfsg-1ubuntu1) UNRELEASED; urgency=medium
     Tools version (5.8) that Ubuntu skipped.
   * Add arm64 to the arches GLES is built on in qtbase5-private-
     dev.install.
+  * Simplify disabling of gold linker in debian/rules.
 
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Thu, 08 Jun 2017 13:48:28 +0300
 
diff --git a/debian/rules b/debian/rules
index 12a9e27..1f34f57 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.
@@ -54,7 +49,8 @@ endif
 # Run tests only on archs known to pass in the past
 testrun_architectures := amd64 armhf i386
 
-nogoldlinker_architectures := powerpc armhf amd64 ppc64el arm64
+# https://bugs.debian.org/842304
+nogoldlinker_architectures := powerpc armhf amd64 ppc64el arm64 i386
 
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(nogoldlinker_architectures)))
 	extra_configure_opts += -no-use-gold-linker

-- 
qtbase packaging