[SCM] qt5webkit packaging branch, experimental, updated. debian/5.2.0+dfsg-2-2-gaa05391

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit aa05391ad6e6027f69144a8c8d70f961330227f3
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Jan 5 22:37:33 2014 +0400

    Add a patch (disable_jit_llint.diff) to disable JIT and llint on ia64, s390, sparc and mips.
---
 debian/changelog                      |  3 +++
 debian/patches/disable_jit_llint.diff | 42 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 46 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ae4122a..4d1d41d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtwebkit-opensource-src (5.2.0+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Add a patch (disable_jit_llint.diff) to disable JIT and llint on ia64, s390,
+    sparc and mips.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Jan 2014 22:35:45 +0400
 
diff --git a/debian/patches/disable_jit_llint.diff b/debian/patches/disable_jit_llint.diff
new file mode 100644
index 0000000..4936818
--- /dev/null
+++ b/debian/patches/disable_jit_llint.diff
@@ -0,0 +1,42 @@
+Description: disable JIT and llint on ia64, s390, sparc and mips
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Forwarded: no
+Last-Update: 2014-01-05
+
+--- a/Source/JavaScriptCore/Target.pri
++++ b/Source/JavaScriptCore/Target.pri
+@@ -18,6 +18,11 @@
+ *-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
+ *-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
+ 
++# Disable JIT and llint on some archs
++equals(QT_ARCH, ia64)|equals(QT_ARCH, s390)|equals(QT_ARCH, sparc)|equals(QT_ARCH, mips) {
++    DEFINES += ENABLE_JIT=0 ENABLE_LLINT=0
++}
++
+ # Rules when JIT enabled (not disabled)
+ !contains(DEFINES, ENABLE_JIT=0) {
+     linux*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -741,9 +741,9 @@
+ #define ENABLE_JIT 1
+ #endif
+ 
+-/* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms. */
++/* The JIT is enabled by default on all x86, x86-64 & ARM platforms. */
+ #if !defined(ENABLE_JIT) \
+-    && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \
++    && (CPU(X86) || CPU(X86_64) || CPU(ARM)) \
+     && (OS(DARWIN) || !COMPILER(GCC) || GCC_VERSION_AT_LEAST(4, 1, 0)) \
+     && !OS(WINCE) \
+     && !(OS(QNX) && !PLATFORM(QT)) /* We use JIT in QNX Qt */
+@@ -777,7 +777,7 @@
+     && ENABLE(JIT) \
+     && (OS(DARWIN) || OS(LINUX)) \
+     && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK) || PLATFORM(QT)) \
+-    && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(MIPS) || CPU(SH4))
++    && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(SH4))
+ #define ENABLE_LLINT 1
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 68f3936..7b42e59 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ stabs_format_debug_info.diff
 no_gc_sections.diff
 hurd.diff
 webkit_qt_hide_symbols.diff
+disable_jit_llint.diff

-- 
qt5webkit packaging