[SCM] qt5webkit packaging branch, experimental, updated. debian/5.2.0+dfsg-1-3-g96be278

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 96be2782d9ed3ee601582077fc2d090c7450d6e8
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Dec 20 08:57:45 2013 -0300

    Workaround FTBFS in 64 bits big endian archs.
    
    See https://bugs.webkit.org/show_bug.cgi?id=113638
---
 debian/changelog |  2 ++
 debian/rules     | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e6476e..7194ee9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtwebkit-opensource-src (5.2.0+dfsg-2) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Update symbols files with buildd's logs.
+  * Workaround FTBFS in 64 bits big endian archs.
+    See https://bugs.webkit.org/show_bug.cgi?id=113638
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 19 Dec 2013 22:48:15 -0300
 
diff --git a/debian/rules b/debian/rules
index ba3b5d6..8898020 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,10 +8,12 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 
-# Filter -g from environment on troublesome arches. Replace it with -gstabs
-# See also: stabs_format_debug_info.diff
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+# Filter -g from environment on troublesome arches. Replace it with -gstabs
+# See also: stabs_format_debug_info.diff
 ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel armhf mips mipsel m68k))
     export DEB_CFLAGS_MAINT_STRIP := -g
     export DEB_CFLAGS_MAINT_APPEND := -gstabs
@@ -22,6 +24,12 @@ ifneq (,$(filter $(DEB_HOST_ARCH),alpha))
     export DEB_LDFLAGS_MAINT_APPEND := -Wl,--no-relax
 endif
 
+# Workaround FTBFS in 64 bits big endian archs.
+# See https://bugs.webkit.org/show_bug.cgi?id=113638
+ifneq (,$(filter $(DEB_BUILD_ARCH),alpha hppa ia64 powerpc ppc64 sparc sparc64 s390 s390x))
+	DEB_CPPFLAGS_MAINT_APPREND += -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+endif
+
 %:
 	dh $@ --parallel --dbg-package=libqt5webkit5-dbg --with pkgkde_symbolshelper
 

-- 
qt5webkit packaging