[SCM] QtWebKit packaging branch, master, updated. debian/2.3.2.dfsg-2-9-g8592609

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 8592609466d6a685d7a55ade7e4642fcb176276a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Sep 5 14:42:52 2014 -0300

    Also disable JIT on x32.
---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 74ca594..fcc12a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ qtwebkit (2.3.2.dfsg-3) UNRELEASED; urgency=medium
     (Closes: #760519). Thanks Samuel Thibault for the patch.
   * Update symbols files with buildds' logs.
   * Add x32_support.patch to support x32 (Closes: #700093).
+    - Also disable JIT on x32.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 04 Sep 2014 20:42:51 -0300
 
diff --git a/debian/rules b/debian/rules
index 94b60cc..d77067d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,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 mips mipsel powerpc ppc64el s390x,$(DEB_HOST_ARCH)))
+ifneq (,$(filter arm64 armel mips mipsel 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_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