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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 82315367010525a9fe9b3d2bf3131a153cdc7136
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Dec 2 10:21:57 2015 -0300

    Add various archs to the list of archs in which to disable JIT.
---
 debian/changelog | 4 ++++
 debian/rules     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7e4319b..c833bf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtwebkit (2.3.4.dfsg-6) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add alpha, m68k, ppc64, sh4 and sparc64 to the list of architectures where
+    the JIT should be disabled (Closes: #806837).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 02 Dec 2015 10:19:22 -0300
 
 qtwebkit (2.3.4.dfsg-5) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index cc69158..a5f6947 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 mips64 mips64el powerpc ppc64el s390x x32,$(DEB_HOST_ARCH)))
+ifneq (,$(filter alpha arm64 armel hppa m68k mips mips64 mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64 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