diff options
| author | Sune Vuorela <pusling@eider.killmulehill.net> | 2010-04-09 00:53:38 +0200 |
|---|---|---|
| committer | Sune Vuorela <pusling@eider.killmulehill.net> | 2010-04-09 01:43:55 +0200 |
| commit | 848afe6176f7a1595727116498595b78799c6f8a (patch) | |
| tree | 4862b5563306d65d05a94373731d66147f5821df | |
| parent | 40a33fd200e506bfe083e65241d5489e9f0034e5 (diff) | |
| download | qt4-x11-848afe6176f7a1595727116498595b78799c6f8a.tar.gz | |
change the s390 patch to disable debugging symbols completely, also stabs is apparantly too big for s390 to handle
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/patches/91_s390_no_webkit_debugging.diff (renamed from debian/patches/91_s390_-gstabs.diff) | 6 | ||||
| -rw-r--r-- | 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@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 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@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 |