[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-3ubuntu2-10-ge76670e

Timo Jyrinki timo at moszumanska.debian.org
Thu Aug 25 06:51:25 UTC 2016


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

The following commit has been merged in the ubuntu branch:
commit 2ebd205cf072fde0c5d648d2697fc624cc233a80
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Aug 16 12:51:29 2016 +0000

    Don't use gold linker on powerpc. (LP: #1611227)
---
 debian/changelog | 6 ++++++
 debian/rules     | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 31a6219..19dae08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qtbase-opensource-src (5.6.1+dfsg-3ubuntu2~1) yakkety; urgency=medium
+
+  * Don't use gold linker on powerpc. (LP: #1611227)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 09 Aug 2016 06:29:25 +0000
+
 qtbase-opensource-src (5.6.1+dfsg-3ubuntu1~4) yakkety; urgency=medium
 
   * New upstream release. 
diff --git a/debian/rules b/debian/rules
index 38cfadf..1cd9d43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,6 +69,12 @@ endif
 # Run tests only on archs known to pass in the past
 testrun_architectures := amd64 armhf i386
 
+nogoldlinker_architectures := powerpc
+
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(nogoldlinker_architectures)))
+	extra_configure_opts += -no-use-gold-linker
+endif
+
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64 mips64 mips64el arm64))
 	platform_arg = linux-g++

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list