[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.2-2-3-gcd68765
Sune Vuorela
pusling-guest at alioth.debian.org
Thu Apr 8 23:45:56 UTC 2010
The following commit has been merged in the master branch:
commit 848afe6176f7a1595727116498595b78799c6f8a
Author: Sune Vuorela <pusling at eider.killmulehill.net>
Date: Fri Apr 9 00:53:38 2010 +0200
change the s390 patch to disable debugging symbols completely, also stabs is apparantly too big for s390 to handle
---
debian/changelog | 5 +++++
...stabs.diff => 91_s390_no_webkit_debugging.diff} | 6 ++----
debian/patches/series | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6f60d3e..e68d6e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
qt4-x11 (4:4.6.2-3) experimentalUNRELEASED; urgency=low
+ * Do not build webkit with debugging symbols on s390. These becomes too big
+ and thus the build fails, as the linker can't handle more than a couple of
+ GB large files, and debugging symbols on s390 are real large. This is a
+ repetition of #528485
+
-- Sune Vuorela <debian at pusling.com> Fri, 09 Apr 2010 01:37:15 +0200
qt4-x11 (4:4.6.2-2) experimental; urgency=low
diff --git a/debian/patches/91_s390_-gstabs.diff b/debian/patches/91_s390_no_webkit_debugging.diff
similarity index 74%
rename from debian/patches/91_s390_-gstabs.diff
rename to debian/patches/91_s390_no_webkit_debugging.diff
index 91e2d1f..3dc23fc 100644
--- a/debian/patches/91_s390_-gstabs.diff
+++ b/debian/patches/91_s390_no_webkit_debugging.diff
@@ -1,14 +1,13 @@
author: Sune Vuorela <sune at debian.org>
-Build s390 debugging symbols with -gstabs instead of with -g
-to reduce linker memory usage.
+Don't do debugging symbols for webkit on s390, it is too big for the linker.
Thanks to Oswald Buddenhagen for the hint.
Debian bug 528485
--- a/src/3rdparty/webkit/WebKit.pri
+++ b/src/3rdparty/webkit/WebKit.pri
-@@ -43,6 +43,14 @@ CONFIG(release, debug|release) {
+@@ -43,6 +43,13 @@ CONFIG(release, debug|release) {
DEFINES += NDEBUG
}
@@ -16,7 +15,6 @@ Debian bug 528485
+equals(arch, s390) {
+ message("S/390 workaround: is not building with -g, but with -gstabs")
+ QMAKE_CXXFLAGS -= -g
-+ QMAKE_CXXFLAGS += -gstabs
+}
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 7b09ea4..c59d016 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,7 +38,7 @@
81_hurd_architecture.diff
82_hurd_SA_SIGINFO.diff
89_powerpc_opts.diff
-91_s390_-gstabs.diff
+91_s390_no_webkit_debugging.diff
92_armel_gcc43_valist_compat.diff
95_sparc_platform_definition.diff
96_powerpc_no_gc_sections.diff
--
Qt 4 Debian packaging
More information about the pkg-kde-commits
mailing list