[SCM] qt5webkit packaging branch, experimental, updated. debian/5.2.0+dfsg-2-5-g84c41b7
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Sat Jan 11 00:28:03 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt5webkit.git;a=commitdiff;h=84c41b7
The following commit has been merged in the experimental branch:
commit 84c41b77da9f6eb7658e11bb725401c017d7986b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Fri Jan 10 21:25:31 2014 -0300
I need to pass exactly what was pased to DEFINES+=.
Thiago explained me that internally qmake stores them in a QSTringList
(actually a ProStringList).
---
debian/patches/disable_jit_llint.diff | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/debian/patches/disable_jit_llint.diff b/debian/patches/disable_jit_llint.diff
index 2a46a5e..f3cd8c0 100644
--- a/debian/patches/disable_jit_llint.diff
+++ b/debian/patches/disable_jit_llint.diff
@@ -5,14 +5,13 @@ Last-Update: 2014-01-05
--- a/Source/JavaScriptCore/Target.pri
+++ b/Source/JavaScriptCore/Target.pri
-@@ -18,6 +18,12 @@ CONFIG += staticlib
+@@ -18,6 +18,11 @@ CONFIG += staticlib
*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
+# Disable JIT and llint on archs where it FTBFS.
+equals(QT_ARCH, ia64)|equals(QT_ARCH, s390)|equals(QT_ARCH, sparc) {
-+ DEFINES -= ENABLE_JIT ENABLE_LLINT
-+ DEFINES += ENABLE_JIT=0 ENABLE_LLINT=0
++ DEFINES -= ENABLE_JIT=1 ENABLE_LLINT=1
+}
+
# Rules when JIT enabled (not disabled)
--
qt5webkit packaging
More information about the pkg-kde-commits
mailing list