rev 14304 - in trunk/packages/qt4-x11/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Tue Apr 7 19:18:13 UTC 2009


Author: fabo
Date: 2009-04-07 19:18:13 +0000 (Tue, 07 Apr 2009)
New Revision: 14304

Added:
   trunk/packages/qt4-x11/debian/patches/89_powerpc_opts.diff
   trunk/packages/qt4-x11/debian/patches/90_ia64_boilerplate.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
* Add patches:
  - 89_powerpc_opts.diff
    Build with -fno-optimize-sibling-calls on powerpc, since it causes a
    build failure with GCC 4.3. Thanks to Colin Watson.
  - 90_ia64_boilerplate.diff
    Don't try to use special hand assembly for printing the boilerplate
    message on ia64, since it causes a build failure due to undefined
    symbols. Thanks to Steve Langasek.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2009-04-07 19:12:47 UTC (rev 14303)
+++ trunk/packages/qt4-x11/debian/changelog	2009-04-07 19:18:13 UTC (rev 14304)
@@ -1,3 +1,16 @@
+qt4-x11 (4.5.0-3) UNRELEASED; urgency=low
+
+  * Add patches:
+    - 89_powerpc_opts.diff
+      Build with -fno-optimize-sibling-calls on powerpc, since it causes a
+      build failure with GCC 4.3. Thanks to Colin Watson.
+    - 90_ia64_boilerplate.diff
+      Don't try to use special hand assembly for printing the boilerplate
+      message on ia64, since it causes a build failure due to undefined
+      symbols. Thanks to Steve Langasek.
+
+ -- Fathi Boudra <fabo at debian.org>  Tue, 07 Apr 2009 21:09:54 +0200
+
 qt4-x11 (4.5.0-2) experimental; urgency=low
 
   * Add qt-copy patches:

Added: trunk/packages/qt4-x11/debian/patches/89_powerpc_opts.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/89_powerpc_opts.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/89_powerpc_opts.diff	2009-04-07 19:18:13 UTC (rev 14304)
@@ -0,0 +1,14 @@
+powerpc needs -O2 -fno-optimize-sibling-calls for qstring.cpp, not just -O2.
+Not needed long-term as the relevant g++ bug is fixed in GCC 4.4.
+
+--- a/mkspecs/linux-g++/qmake.conf
++++ b/mkspecs/linux-g++/qmake.conf
+@@ -11,3 +11,8 @@ QMAKE_INCREMENTAL_STYLE = sublib
+ include(../common/g++.conf)
+ include(../common/linux.conf)
+ load(qt_config)
++
++equals(QT_ARCH, powerpc) {
++    QMAKE_CFLAGS_RELEASE   += -fno-optimize-sibling-calls
++    QMAKE_CXXFLAGS_RELEASE += -fno-optimize-sibling-calls
++}

Added: trunk/packages/qt4-x11/debian/patches/90_ia64_boilerplate.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/90_ia64_boilerplate.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/90_ia64_boilerplate.diff	2009-04-07 19:18:13 UTC (rev 14304)
@@ -0,0 +1,38 @@
+--- a/src/corelib/global/qlibraryinfo.cpp
++++ b/src/corelib/global/qlibraryinfo.cpp
+@@ -525,35 +525,6 @@ void qt_core_init_boilerplate() __attrib
+     asm ("syscall\n"                            \
+          : : "a" (SYS_exit), "D" (0)); _exit(c)
+ 
+-#  elif defined(QT_ARCH_IA64)
+-#define sysinit()                                               \
+-    asm volatile ("{.mlx\n"                                     \
+-                  "      nop.m  0\n"                            \
+-                  "      movl   r2  = @pcrel(boilerplate);;"    \
+-                  "}\n"                                         \
+-                  "{.mii\n"                                     \
+-                  "      mov   r10 = @ltoffx(boilerplate)\n"    \
+-                  "      mov   r1  = ip\n"                      \
+-                  "      adds  r2  = -16, r2\n;;\n"             \
+-                  "}\n"                                         \
+-                  "      add   r1  = r2, r1;;\n"                \
+-                  "      sub   r1  = r1, r10;;\n"               \
+-                  : : : "r2", "r10")
+-#define syswrite(msg, len)                                              \
+-    ({ const char *_msg = msg;                                          \
+-        asm ("mov    out0=%1\n"                                         \
+-             "mov    out1=%2\n"                                         \
+-             "mov    out2=%3\n"                                         \
+-             ";;\n"                                                     \
+-             "mov    r15=%0\n"                                          \
+-             "break  0x100000;;\n"                                      \
+-             : : "I" (SYS_write), "I" (1), "r" (_msg), "r" (len)); })
+-#define sysexit(c)                                                      \
+-    asm ("mov    out0=%1\n"                                             \
+-         ";;\n"                                                         \
+-         "mov    r15=%0\n"                                              \
+-         "break  0x100000;;\n"                                          \
+-         : : "I" (SYS_exit), "O" (0)); write(1, 0, 0); _exit(c)
+ # else
+ #define sysinit() (void)0
+ #define syswrite(msg, len) (msg); (len)

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2009-04-07 19:12:47 UTC (rev 14303)
+++ trunk/packages/qt4-x11/debian/patches/series	2009-04-07 19:18:13 UTC (rev 14304)
@@ -36,3 +36,5 @@
 71_hppa_unaligned_access_fix_458133.diff
 80_hurd_max_path.diff
 81_hurd_more_max_path.diff
+89_powerpc_opts.diff
+90_ia64_boilerplate.diff




More information about the pkg-kde-commits mailing list