[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.7.1+dfsg-2ubuntu1

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 8422dde3adcf128c1397a634b4636a6b3eaa8338
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jan 9 07:37:16 2017 +0000

    Disable gold linker also on amd64 (LP: #1654820)
    
    * Disable gold linker also on amd64 (LP: #1654820)
      - Now disabled on i386, powerpc, armhf, amd64
---
 debian/changelog | 2 ++
 debian/rules     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 93ca9ff..79ec734 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ qtbase-opensource-src (5.7.1+dfsg-2ubuntu1) UNRELEASED; urgency=medium
   * debian/patches/QSettings-Avoid-unneeded-sync-on-destruction.patch:
     - Backport from 5.8 (LP: #1642605)
   * Disable gold linker also on armhf (LP: #1653529)
+  * Disable gold linker also on amd64 (LP: #1654820)
+    - Now disabled on i386, powerpc, armhf, amd64
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 25 Aug 2016 11:01:48 +0000
 
diff --git a/debian/rules b/debian/rules
index e8900fe..0e75fd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,7 +74,7 @@ endif
 # Run tests only on archs known to pass in the past
 testrun_architectures := amd64 armhf i386
 
-nogoldlinker_architectures := powerpc armhf
+nogoldlinker_architectures := powerpc armhf amd64
 
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(nogoldlinker_architectures)))
 	extra_configure_opts += -no-use-gold-linker

-- 
qtbase packaging