[SCM] qtwebengine packaging branch, master, updated. debian/5.9.1+dfsg-3-2-ga17d513

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit a17d5139ad7eb6085822bf552457807d62b0e31e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Aug 17 15:22:58 2017 +0300

    Disable gold on arm64, to workaround bug #869768.
---
 debian/changelog                    |  2 ++
 debian/libqt5webenginecore5.symbols | 24 ++++++++++++------------
 debian/rules                        |  6 +++++-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 484df51..d43916f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtwebengine-opensource-src (5.9.1+dfsg-4) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Disable gold on arm64, to workaround bug #869768.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 17 Aug 2017 15:22:07 +0300
 
diff --git a/debian/libqt5webenginecore5.symbols b/debian/libqt5webenginecore5.symbols
index 8556fab..110bcd2 100644
--- a/debian/libqt5webenginecore5.symbols
+++ b/debian/libqt5webenginecore5.symbols
@@ -1,17 +1,17 @@
 # SymbolsHelper-Confirmed: 5.9.1 amd64 arm64 armhf i386
 libQt5WebEngineCore.so.5 libqt5webenginecore5 #MINVER#
- (optional=gold|arch=!i386)Qt_5.0 at Qt_5.0 5.7.1
- (optional=gold|arch=!i386)Qt_5.1 at Qt_5.1 5.7.1
- (optional=gold|arch=!i386)Qt_5.2 at Qt_5.2 5.7.1
- (optional=gold|arch=!i386)Qt_5.3 at Qt_5.3 5.7.1
- (optional=gold|arch=!i386)Qt_5.4 at Qt_5.4 5.7.1
- (optional=gold|arch=!i386)Qt_5.5 at Qt_5.5 5.7.1
- (optional=gold|arch=!i386)Qt_5.6 at Qt_5.6 5.7.1
- (optional=gold|arch=!i386)Qt_5.7 at Qt_5.7 5.7.1
- (optional=gold|arch=!i386)Qt_5.8 at Qt_5.8 5.9.1
- (optional=gold|arch=!i386)Qt_5.9 at Qt_5.9 5.9.1
- (optional=gold|arch=!i386)Qt_5 at Qt_5 5.7.1
- (optional=gold|arch=!i386)Qt_5_PRIVATE_API at Qt_5_PRIVATE_API 5.7.1
+ (optional=gold|arch=!arm64 !i386)Qt_5.0 at Qt_5.0 5.7.1
+ (optional=gold|arch=!arm64 !i386)Qt_5.1 at Qt_5.1 5.7.1
+ (optional=gold|arch=!arm64 !i386)Qt_5.2 at Qt_5.2 5.7.1
+ (optional=gold|arch=!arm64 !i386)Qt_5.3 at Qt_5.3 5.7.1
+ (optional=gold|arch=!arm64 !i386)Qt_5.4 at Qt_5.4 5.7.1
+ (optional=gold|arch=!arm64 !i386)Qt_5.5 at Qt_5.5 5.7.1
+ (optional=gold|arch=!arm64 !i386)Qt_5.6 at Qt_5.6 5.7.1
+ (optional=gold|arch=!arm64 !i386)Qt_5.7 at Qt_5.7 5.7.1
+ (optional=gold|arch=!arm64 !i386)Qt_5.8 at Qt_5.8 5.9.1
+ (optional=gold|arch=!arm64 !i386)Qt_5.9 at Qt_5.9 5.9.1
+ (optional=gold|arch=!arm64 !i386)Qt_5 at Qt_5 5.7.1
+ (optional=gold|arch=!arm64 !i386)Qt_5_PRIVATE_API at Qt_5_PRIVATE_API 5.7.1
  _ZN11QtWebEngine11processMainEiPPKc at Qt_5 5.7.1
  _ZN14WebEngineError15toQtErrorDomainEi at Qt_5 5.7.1
  _ZN14WebEngineError16UserAbortedErrorE at Qt_5 5.7.1
diff --git a/debian/rules b/debian/rules
index 631dc88..6865294 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,7 @@ disabled_jit_architectures := armel mips mipsel
 disabled_pch_architectures := amd64 powerpc s390x
 
 small_architectures := armhf mipsel
+no_gold_architectures := arm64 armhf mipsel
 
 defines+=skia_use_system_expat \
          skia_use_system_freetype2 \
@@ -145,7 +146,10 @@ 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
-	#Use not ld.gold
+endif
+
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(no_gold_architectures)))
+	# Do not use ld.gold
 	echo "QMAKE_LFLAGS -= -fuse-ld=gold" >> .qmake.conf
 	echo "QMAKE_LFLAGS += -fuse-ld=bfd" >> .qmake.conf
 endif

-- 
qtwebengine packaging