[SCM] QtWebKit packaging branch, master, updated. debian/2.2.1-7-53-g03fb5cb

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit f520e766e8d8858a085de17dec93e7e44c871ac3
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Fri Aug 29 09:12:01 2014 +0200

    Use "-gstabs" where possible.
---
 debian/rules | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 11983d4..db7bb7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,14 +5,10 @@
 
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
-# Filter -g from environment on troublesome arches. Replace it with -gstabs
-# See also: stabs_format_debug_info.diff
+# only enable debugging symbols on archs supporting -gstabs
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel armhf mips mipsel sh4 m68k))
-    export DEB_CFLAGS_MAINT_STRIP := -g
-    export DEB_CFLAGS_MAINT_APPEND := -gstabs
-    export DEB_CXXFLAGS_MAINT_STRIP := -g
-    export DEB_CXXFLAGS_MAINT_APPEND := -gstabs
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), amd64 i386 powerpc s390x))
+    QMAKE_CXXFLAGS := "--qmakearg=\"QMAKE_CXXFLAGS+=-gstabs\""
 endif
 ifneq (,$(filter $(DEB_HOST_ARCH),alpha))
     export DEB_LDFLAGS_MAINT_APPEND := -Wl,--no-relax
@@ -36,11 +32,11 @@ override_dh_auto_build:
 #disable WTF_USE_3D_GRAPHICS on ARM where it doesn't compile
 #disable forcing SSE2 on all other platforms
 ifneq (,$(filter arm64 powerpc ppc64el,$(DEB_HOST_ARCH)))
-	./Tools/Scripts/build-webkit --qt DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0
+	./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
+	./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)
 else
-	./Tools/Scripts/build-webkit --qt --no-force-sse2
+	./Tools/Scripts/build-webkit --qt $(QMAKE_CXXFLAGS) --no-force-sse2
 endif
 
 override_dh_auto_install:

-- 
QtWebKit packaging