[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week09-3

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 5d407b5c6cfb7230fdde2d17bc49b8b1bf2dd9a3
Author: Modestas Vainius <modax at debian.org>
Date:   Mon Mar 28 03:35:18 2011 +0300

    Really replace -g with -gstabs on s390, mips, mipsel and armel.
    
    Previously it used to grab -g from environment CXXFLAGS. Hopefully this will
    truly fix OOMs when linking. (Closes: #618325)
---
 debian/changelog                            |    3 +++
 debian/patches/stabs_format_debug_info.diff |   10 +++++-----
 debian/rules                                |    8 ++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a781f17..ef8a81d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtwebkit (2.1.0~2011week09-3) UNRELEASED; urgency=low
   * Rename 08_powerpc_s390_no_gc_sections.diff to no_gc_sections.diff and
     extend it to cover armel and mip* as well. Full list: powerpc, s390, arm*,
     mips*.
+  * Really replace -g with -gstabs on s390, mips, mipsel and armel. Previously
+    it used to grab -g from environment CXXFLAGS.  Hopefully this will truly
+    fix OOMs when linking. (Closes: #618325)
 
  -- Modestas Vainius <modax at debian.org>  Mon, 28 Mar 2011 03:11:16 +0300
 
diff --git a/debian/patches/stabs_format_debug_info.diff b/debian/patches/stabs_format_debug_info.diff
index 83785f2..7509fb0 100644
--- a/debian/patches/stabs_format_debug_info.diff
+++ b/debian/patches/stabs_format_debug_info.diff
@@ -1,9 +1,9 @@
-Description: build s390 debugging symbols with -gstabs instead of with -g
-             to reduce linker memory usage.
-             Thanks to Oswald Buddenhagen for the hint.
+Description: build s390, armel, mips* debugging symbols with -gstabs
+ -g exhausts memory on these arches. Thanks to Oswald Buddenhagen for the hint.
 author: Sune Vuorela <sune at debian.org>
 Author: Modestas Vainius <modax at debian.org>
 Bug-Debian: http://bugs.debian.org/528485
+Bug-Debian: http://bugs.debian.org/618325
 Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=618325
 
 --- a/WebKit.pri
@@ -12,8 +12,8 @@ Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=618325
      DEFINES += NDEBUG
  }
  
-+equals(QT_ARCH, s390)|equals(QT_ARCH, arm) {
-+	message("S/390 and armel workaround for QtWebkit: do not build with -g, but with -gstabs")
++equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips) {
++	message("s390, armel, mipsel workaround for QtWebkit: do not build with -g, but with -gstabs")
 +	QMAKE_CXXFLAGS -= -g
 +	QMAKE_CXXFLAGS += -gstabs
 +}
diff --git a/debian/rules b/debian/rules
index b7345d1..c12a524 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# 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)
+ifneq (,$(filter $(DEB_HOST_ARCH),s390 armel mips mipsel))
+    export CFLAGS := $(filter-out -g,$(CFLAGS)) -gstabs
+    export CXXFLAGS := $(filter-out -g,$(CXXFLAGS)) -gstabs
+endif
+
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	extra_configure_opts = DEFINES+=ENABLE_VIDEO=1 DEFINES+=ENABLE_GEOLOCATION=1
 endif

-- 
QtWebKit packaging