[SCM] QtWebKit packaging branch, master, updated. debian/2.3.2.dfsg-1-5-g00440bf

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 00440bf35ea39de52aa788b3e582eea4bdf87771
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Sep 3 09:33:28 2014 -0300

    Disable JIT on armel, mips and mipsel.
---
 debian/changelog | 2 ++
 debian/rules     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f051b8d..43566b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ qtwebkit (2.3.2.dfsg-2) UNRELEASED; urgency=medium
     - Added fix_nonlinux_glibc_linkage.diff,
       double_conversion_correct_double_operations.patch and
       reduce_memory_usage.patch.
+  * Add armel, mips and mipsel to the list of archs that should not build the
+    JIT asembler.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 03 Sep 2014 09:04:23 -0300
 
diff --git a/debian/rules b/debian/rules
index e98107d..1181eed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,10 +28,10 @@ override_dh_auto_configure:
 	true
 
 override_dh_auto_build:
-#disable JIT assembler on powerpc/arm64 where it doesn't compile
+#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 powerpc ppc64el,$(DEB_HOST_ARCH)))
+ifneq (,$(filter arm64 armel mips mipsel powerpc ppc64el,$(DEB_HOST_ARCH)))
 	./Tools/Scripts/build-webkit --qt DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 $(QMAKE_CXXFLAGS)
 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_CXXFLAGS)

-- 
QtWebKit packaging