[SCM] QtWebKit packaging branch, experimental, updated. debian/2.2.1-7-42-g782f170

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 3e438e3b7e0cb1dd8d6dc37a69385f3c423caeea
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Wed Aug 20 23:45:48 2014 +0200

    Disable JIT assembler on powerpc/arm64.
    
    Patched picked from Ubuntu packaging.
---
 debian/rules | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8cdaaf8..01d8b7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,12 +32,13 @@ override_dh_auto_configure:
 	true
 
 override_dh_auto_build:
+#disable JIT assembler on powerpc/arm64 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)))
-	./Tools/Scripts/build-webkit --qt
+	./Tools/Scripts/build-webkit --qt DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0
 else ifeq ($(DEB_HOST_ARCH),armhf)
-	./Tools/Scripts/build-webkit --qt DEFINES+=WTF_USE_3D_GRAPHICS=0
+	./Tools/Scripts/build-webkit --qt DEFINES+=WTF_USE_3D_GRAPHICS=0 DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0
 else
 	./Tools/Scripts/build-webkit --qt --no-force-sse2
 endif

-- 
QtWebKit packaging