[SCM] qt5webkit packaging branch, experimental, updated. debian/5.2.1+dfsg-2-5-gaba00e4

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit d4ecbb84a6c5c567b81ce340ba7f79cc924b49de
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Feb 25 12:43:06 2014 -0300

    Only generate debugging symbols on selected archs.
    
    - Use gstabs on i386, powerpc and s390x.
    - Use full debugging only on amd64.
---
 debian/changelog |  3 +++
 debian/rules     | 30 +++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20c811e..1594c06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ qtwebkit-opensource-src (5.2.1+dfsg-3) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Update symbols files with buildd's logs.
+  * Only generate debugging symbols on selected archs.
+    - Use gstabs on i386, powerpc and s390x.
+    - Use full debugging only on amd64.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Feb 2014 23:37:15 -0300
 
diff --git a/debian/rules b/debian/rules
index 4a6fcea..8e4ffa3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,22 +12,30 @@ 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
-    export DEB_CXXFLAGS_MAINT_STRIP := -g
-    export DEB_CXXFLAGS_MAINT_APPEND := -gstabs
-endif
-ifneq (,$(filter $(DEB_HOST_ARCH),alpha))
-    export DEB_LDFLAGS_MAINT_APPEND := -Wl,--no-relax
-endif
+gstab_architectures := i386 powerpc s390x
+fulldebug_architectures := amd64
 
 %:
 	dh $@ --parallel --dbg-package=libqt5webkit5-dbg --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
+	# Run qmake once to create .qmake.conf and be sure to append the following values.
+	qmake
+
+# Enable gstabs debugging symbols only on gstab_architectures.
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gstab_architectures)))
+	echo "QMAKE_CXXFLAGS -= -g" >> .qmake.conf
+	echo "QMAKE_CXXFLAGS += -gstabs" >> .qmake.conf
+# Enable normal debugging symbols only on fulldebug_architectures.
+else ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(fulldebug_architectures)))
+	echo "QMAKE_CXXFLAGS += -g" >> .qmake.conf
+else
+# Disable debugging symbols in all the other archs.
+	echo "QMAKE_CXXFLAGS -= -g" >> .qmake.conf
+	echo "QMAKE_CXXFLAGS -= -gstabs" >> .qmake.conf
+endif
+
+	# Run qmake again now with the proper values.
 	qmake
 
 override_dh_auto_build-arch:

-- 
qt5webkit packaging