[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.7.1+dfsg-2-229-ged10a46

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu+1 branch:
commit ed10a46baf8af95f6d2ec038ed4ebbf38c75155e
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Sun Jan 8 10:41:17 2017 +0000

    Disable gold linker also on armhf (LP: #1653529)
---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f1255bc..93ca9ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ qtbase-opensource-src (5.7.1+dfsg-2ubuntu1) UNRELEASED; urgency=medium
   * Ubuntu doesn't have package named libssl1.0-dev yet.
   * debian/patches/QSettings-Avoid-unneeded-sync-on-destruction.patch:
     - Backport from 5.8 (LP: #1642605)
+  * Disable gold linker also on armhf (LP: #1653529)
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 25 Aug 2016 11:01:48 +0000
 
diff --git a/debian/rules b/debian/rules
index 0f6b99c..e8900fe 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
+nogoldlinker_architectures := powerpc armhf
 
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(nogoldlinker_architectures)))
 	extra_configure_opts += -no-use-gold-linker

-- 
qtbase packaging