[SCM] qtwebengine packaging branch, master, updated. debian/5.7.1+dfsg-6-1-g9c035cd

Sandro Knauß hefee at moszumanska.debian.org
Thu Jan 19 20:19:32 UTC 2017


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

The following commit has been merged in the master branch:
commit 9c035cdb467ba241653d81a4386ab283f8c84dae
Author: Sandro Knauß <hefee at debian.org>
Date:   Thu Jan 19 21:18:59 2017 +0100

    do not use gold linker for small archs
---
 debian/changelog | 7 +++++++
 debian/rules     | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d41d4b2..d48a506 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtwebengine-opensource-src (5.7.1+dfsg-7) UNRELEASED; urgency=medium
+
+  [ Sandro Knauß ]
+  * do not use gold linker for small archs
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 19 Jan 2017 21:18:12 +0100
+
 qtwebengine-opensource-src (5.7.1+dfsg-6) unstable; urgency=medium
 
   [ Sandro Knauß ]
diff --git a/debian/rules b/debian/rules
index 0a696e9..5cbd3d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -121,8 +121,9 @@ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(small_architectures)))
 	echo "QMAKE_CXXFLAGS += --param ggc-min-expand=20" >> .qmake.conf
 	echo "QMAKE_CFLAGS += --param ggc-min-expand=20" >> .qmake.conf
 	echo "QMAKE_LFLAGS -= Wl,--gc-sections" >> .qmake.conf
-	echo "QMAKE_LFLAGS -= -use-ld=gold" >> .qmake.conf
-	echo "QMAKE_LFLAGS += -use-ld=bfd" >> .qmake.conf
+	#Use not ld.gold
+	echo "QMAKE_LFLAGS -= -fuse-ld=gold" >> .qmake.conf
+	echo "QMAKE_LFLAGS += -fuse-ld=bfd" >> .qmake.conf
 endif
 
 	# Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.

-- 
qtwebengine packaging



More information about the pkg-kde-commits mailing list