[SCM] qt5webkit packaging branch, experimental, updated. debian/5.2.1+dfsg-3-5-gb5823ff
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Sat Mar 15 13:48:24 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt5webkit.git;a=commitdiff;h=b5823ff
The following commit has been merged in the experimental branch:
commit b5823ff664350e4242d57697dae4d4af2f51d4e6
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Sat Mar 15 10:48:03 2014 -0300
Disable JIT on armel, mips and mipsel.
---
debian/changelog | 1 +
debian/rules | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index bba810d..da490c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtwebkit-opensource-src (5.2.1+dfsg-4) UNRELEASED; urgency=medium
* Create reduce_memory_usage.patch forcing ld to not cache the symbol tables
of input files in memory to avoid memory exhaustion during the linking
phase.
+ * Disable JIT on armel, mips and mipsel.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 05 Mar 2014 12:13:03 -0300
diff --git a/debian/rules b/debian/rules
index 8e4ffa3..9bb7781 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
gstab_architectures := i386 powerpc s390x
fulldebug_architectures := amd64
+disabled_jit_architectures := armel mips mipsel
%:
dh $@ --parallel --dbg-package=libqt5webkit5-dbg --with pkgkde_symbolshelper
@@ -35,6 +36,11 @@ else
echo "QMAKE_CXXFLAGS -= -gstabs" >> .qmake.conf
endif
+# Disable JIT on selected architectures
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(disabled_jit_architectures)))
+ echo "QMAKE_CXXFLAGS += -DENABLE_JIT=0" >> .qmake.conf
+endif
+
# Run qmake again now with the proper values.
qmake
--
qt5webkit packaging
More information about the pkg-kde-commits
mailing list