[SCM] qt5webkit packaging branch, master, updated. debian/5.212.0_alpha2-5-2-g0673982

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 067398240a710bfb12420283f486903ec64badd6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Nov 8 17:20:42 2017 +0300

    Make sure JIT is not enabled on x32.
    
    References: #881055.
---
 debian/changelog | 2 ++
 debian/rules     | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e614e2f..a883b14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtwebkit-opensource-src (5.212.0~alpha2-6) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Make sure JIT is not enabled on x32.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 08 Nov 2017 17:14:28 +0300
 
diff --git a/debian/rules b/debian/rules
index acd2533..cf46c09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
 
 export DEB_CPPFLAGS_MAINT_APPEND = -DNDEBUG
 
@@ -23,7 +21,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH_CPU),mips mipsel))
 endif
 
 # JIT is only supported on x86 / armhf / aarch64 / mips32
-ifeq (,$(filter $(DEB_HOST_ARCH_CPU),amd64 arm64 armhf i386 mips mipsel))
+ifeq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 armhf i386 mips mipsel))
 	EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF
 endif
 

-- 
qt5webkit packaging