[SCM] QtWebKit packaging branch, master, updated. debian/2.3.2.dfsg-2-3-g91c40ea
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Thu Sep 4 23:46:34 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=3aea4e4
The following commit has been merged in the master branch:
commit 3aea4e4e56732cba3a024aedda49021fa9497c7b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Thu Sep 4 20:44:04 2014 -0300
Disable JIT also in s390x.
---
debian/changelog | 3 +++
debian/rules | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 94a240f..dd65a87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
qtwebkit (2.3.2.dfsg-3) UNRELEASED; urgency=medium
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Disable JIT also in s390x.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 04 Sep 2014 20:42:51 -0300
qtwebkit (2.3.2.dfsg-2) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 1181eed..94b60cc 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,$(DEB_HOST_ARCH)))
+ifneq (,$(filter arm64 armel mips mipsel powerpc ppc64el s390x,$(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
More information about the pkg-kde-commits
mailing list