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

Modestas Vainius modax at alioth.debian.org
Mon Mar 28 07:25:35 UTC 2011


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

    Do not pass -Wl,--gc-sections on arm* and mips*.
    
    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*.
---
 debian/changelog                                   |    3 +++
 ...390_no_gc_sections.diff => no_gc_sections.diff} |    8 ++++----
 debian/patches/series                              |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3510bc..a781f17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 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*.
 
  -- Modestas Vainius <modax at debian.org>  Mon, 28 Mar 2011 03:11:16 +0300
 
diff --git a/debian/patches/08_powerpc_s390_no_gc_sections.diff b/debian/patches/no_gc_sections.diff
similarity index 63%
rename from debian/patches/08_powerpc_s390_no_gc_sections.diff
rename to debian/patches/no_gc_sections.diff
index be7d66a..a226778 100644
--- a/debian/patches/08_powerpc_s390_no_gc_sections.diff
+++ b/debian/patches/no_gc_sections.diff
@@ -1,11 +1,11 @@
-Description: do not pass -Wl,--gc-sections on powerpc and s390 when building
+Description: do not pass -Wl,--gc-sections on powerpc, s390, arm* and mips* when building
              libQtWebKit.so; works around a binutils bug that results in a
-             segfault on powerpc and an internal link error on s390.
+             segfault on powerpc, internal link error on s390 and OOM on armel/mipsel.
 Author: Steve Langasek <vorlon at debian.org>
 Author: Modestas Vainius <modax at debian.org>
 Origin: vendor
 Forwarded: no
-Last-Update: 2010-04-11 (s390 added)
+Last-Update: 2011-03-28 (mips* and arm* added)
 
 --- a/WebCore/WebCore.pro
 +++ b/WebCore/WebCore.pro
@@ -14,7 +14,7 @@ Last-Update: 2010-04-11 (s390 added)
  
  unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections 
 -unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
-+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):QMAKE_LFLAGS += -Wl,--gc-sections
++unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--gc-sections
  linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
  
  CONFIG(release) {
diff --git a/debian/patches/series b/debian/patches/series
index 565b0ca..7cbb98e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,6 @@
 05_sparc_unaligned_access.diff
 06_kfreebsd_strnstr.diff
 stabs_format_debug_info.diff
-08_powerpc_s390_no_gc_sections.diff
+no_gc_sections.diff
 09_hurd.diff
 webcore_qtplatformplugin_createfullscreenvideohandler_ftbfs.patch

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list