[SCM] qt5webkit packaging branch, master, updated. debian/5.212.0_alpha2-6-4-g41d4ffc

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 41d4ffcdcbf0236257a3cfcda55dcf0aa3a215c8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jan 18 11:30:58 2018 +0300

    Use += instead of = to make sure the -g to -g1 change is not lost.
    
    Without this we would build with full -g on sh3/sh4 and with no debug
    on mips/mipsel.
---
 debian/changelog | 1 +
 debian/rules     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 022353b..258880f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtwebkit-opensource-src (5.212.0~alpha2-7) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Build with -O1 instead of -O2 on sh3/sh4 (closes: #887462).
   * Update symbols files with buildds’ and sh4 logs (closes: #887463).
+  * Fix the rules syntax to make sure we build with -g1 on mips/mipsel.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Jan 2018 14:33:04 +0300
 
diff --git a/debian/rules b/debian/rules
index 47754e4..75c72ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,13 +17,13 @@ endif
 
 # See https://github.com/annulen/webkit/issues/626
 ifneq (,$(filter $(DEB_HOST_ARCH_CPU),mips mipsel))
-	export DEB_CXXFLAGS_MAINT_APPEND = -mfp32
+	export DEB_CXXFLAGS_MAINT_APPEND += -mfp32
 endif
 
 # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81426
 ifneq (,$(filter $(DEB_HOST_ARCH_CPU),sh3 sh4))
-	export DEB_CXXFLAGS_MAINT_STRIP = -O2
-	export DEB_CXXFLAGS_MAINT_APPEND = -O1
+	export DEB_CXXFLAGS_MAINT_STRIP += -O2
+	export DEB_CXXFLAGS_MAINT_APPEND += -O1
 endif
 
 # Disable gold linker on all architectures except x32

-- 
qt5webkit packaging