[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

Fathi Boudra fabo at alioth.debian.org
Sat Jun 11 11:42:59 UTC 2011


The following commit has been merged in the experimental-snapshots branch:
commit df2bbfaebe7795081ee7167df52d54afb57c7d34
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 7 02:54:09 2011 +0300

    Build designer library with -gstabs on powerpc.
    
    This is needed to avoid gcc 4.6 dwarf2 ICE, which makes the package FTBFS [1].
    (patch powerpc_designer_gstabs.diff).
    
    [1] https://buildd.debian.org/status/fetch.php?pkg=qt4-x11&arch=powerpc&ver=4%3A4.7.2-4&stamp=1304320067
---
 debian/changelog                            |    2 +
 debian/patches/powerpc_designer_gstabs.diff |   29 +++++++++++++++++++++++++++
 debian/patches/series                       |    1 +
 3 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92231e4..e777788 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ qt4-x11 (4:4.7.3-1) UNRELEASED; urgency=low
   * Drop 91_s390_use_gstabs.diff patch. It's no longer needed as webkit is not
     built from Qt sources anymore.
   * Drop 89_powerpc_opts.diff patch. No longer needed with gcc 4.4 or later.
+  * Build designer library with -gstabs on powerpc to avoid gcc 4.6 dwarf2 ICE,
+    which makes the package FTBFS (patch powerpc_designer_gstabs.diff).
 
  -- Fathi Boudra <fabo at debian.org>  Wed, 04 May 2011 13:08:38 +0300
 
diff --git a/debian/patches/powerpc_designer_gstabs.diff b/debian/patches/powerpc_designer_gstabs.diff
new file mode 100644
index 0000000..710e1a4
--- /dev/null
+++ b/debian/patches/powerpc_designer_gstabs.diff
@@ -0,0 +1,29 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: workaround FTBFS on powerpc/gcc 4.6 in signalsloteditor
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2011-05-07
+
+This should workaround g++-4.6/powerpc ICE that is related to dwarf2 [1][2].
+It is very likely the patch will not be needed long term as the gcc bug might
+eventually be fixed.
+
+[1] .moc/release-shared/qteditorfactory.moc:237:1: internal compiler error: in size_of_die, at dwarf2out.c:10749
+Please submit a full bug report,
+with preprocessed source if appropriate.
+
+[2] https://buildd.debian.org/status/fetch.php?pkg=qt4-x11&arch=powerpc&ver=4%3A4.7.2-4&stamp=1304320067
+
+--- a/tools/designer/src/components/signalsloteditor/signalsloteditor.pri
++++ b/tools/designer/src/components/signalsloteditor/signalsloteditor.pri
+@@ -19,3 +19,10 @@ SOURCES += $$PWD/signalslot_utils.cpp \
+     $$PWD/signalsloteditorwindow.cpp
+ 
+ FORMS += $$PWD/connectdialog.ui
++
++equals(QT_ARCH, powerpc) {
++    message("powerpc/gcc 4.6 ICE workaround for designer: build with -gstabs rather than -g")
++    QMAKE_CXXFLAGS -= -g
++    QMAKE_CXXFLAGS += -gstabs
++}
++
diff --git a/debian/patches/series b/debian/patches/series
index 10aed1d..703392b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,3 +38,4 @@ powerpcspe.diff
 sh.diff
 kfreebsd_monotonic_clock.diff
 arm_qbasicatomicint_disable_vol_bitfields.diff
+powerpc_designer_gstabs.diff

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list