[SCM] QtWebKit packaging branch, master, updated. debian/2.3.4.dfsg-4-2-gc1540a9

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit c1540a923f020baceadc46d0a83b1ccd2a7dc0a6
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Sep 15 10:04:24 2015 -0300

    Disable JIT on mips64 and mips64el.
---
 debian/changelog | 4 ++++
 debian/rules     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9365aa8..7307af4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtwebkit (2.3.4.dfsg-5) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Disable JIT on mips64 and mips64el. Thanks James Cowgill for the patch
+    (Closes: #725651).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 15 Sep 2015 10:02:28 -0300
 
 qtwebkit (2.3.4.dfsg-4) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 4c80b30..cc69158 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,7 +50,7 @@ override_dh_auto_build:
 	#disable JIT assembler on archs where it doesn't compile
 	#disable WTF_USE_3D_GRAPHICS on ARM where it doesn't compile
 	#disable forcing SSE2 on all other platforms
-ifneq (,$(filter arm64 armel hppa mips mipsel powerpc ppc64el s390x x32,$(DEB_HOST_ARCH)))
+ifneq (,$(filter arm64 armel hppa mips mipsel mips64 mips64el powerpc ppc64el s390x x32,$(DEB_HOST_ARCH)))
 	./Tools/Scripts/build-webkit --qt DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 $(QMAKE_ARGS) $(MAKE_ARGS)
 else ifeq ($(DEB_HOST_ARCH),armhf)
 	./Tools/Scripts/build-webkit --qt DEFINES+=WTF_USE_3D_GRAPHICS=0 DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 $(QMAKE_ARGS) $(MAKE_ARGS)

-- 
QtWebKit packaging