[Pkg-kde-commits] rev 996 - in trunk/packages/kdebindings/debian: . patches

[Adeodato Simó]

Author: dato-guest
Date: 2005-04-10 00:59:18 +0000 (Sun, 10 Apr 2005)
New Revision: 996

Added:
   trunk/packages/kdebindings/debian/patches/051-mipsen-xgot-for-smoke.diff
Modified:
   trunk/packages/kdebindings/debian/changelog
Log:
* Fix build failure on mips and mipsel due to overflow in the relocation
  table (closes: #282134). Changes needed:

  - New patch debian/patches/051-mipsen-xgot-for-smoke.diff: creates a
    'needs_xgot' AM_CONDITIONAL in configure.in, and uses that to possibly
    set libsmokeqt_la_CXXFLAGS to -Wa,-xgot in smoke/{qt,kde}/Makefile.am.

    NOTE: the change for smoke/kde is commented out, since we need to check
    that it is really needed. Thiemo Seufer claims that breakage can occur
    otherwise (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=282134&msg=12).

  TODO: test it on a mipsen machine prior to upload (see -talk)


Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog	2005-04-09 22:42:58 UTC (rev 995)
+++ trunk/packages/kdebindings/debian/changelog	2005-04-10 00:59:18 UTC (rev 996)
@@ -13,14 +13,24 @@
     TODO: Mail Richard Dale (after testing, for confirmation) - DONE: see -talk
     TODO: wait answer from Richard Dale
 
-  * #282134: kdebindings fails to build from source on mips 
-    PENDING - half-implemented
+  * Fix build failure on mips and mipsel due to overflow in the relocation
+    table (closes: #282134). Changes needed:
 
+    - New patch debian/patches/051-mipsen-xgot-for-smoke.diff: creates a
+      'needs_xgot' AM_CONDITIONAL in configure.in, and uses that to possibly
+      set libsmokeqt_la_CXXFLAGS to -Wa,-xgot in smoke/{qt,kde}/Makefile.am.
+
+      NOTE: the change for smoke/kde is commented out, since we need to check
+      that it is really needed. Thiemo Seufer claims that breakage can occur
+      otherwise (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=282134&msg=12).
+
+    TODO: test it on a mipsen machine prior to upload (see -talk)
+
   * Install python-dcop examples (closes: #303654).
 
   * Rename debian/mipsen.mk to debian/mipsen-java.mk.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 10 Apr 2005 00:42:30 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 10 Apr 2005 02:44:37 +0200
 
 kdebindings (4:3.3.2-1) unstable; urgency=low
 

Added: trunk/packages/kdebindings/debian/patches/051-mipsen-xgot-for-smoke.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/051-mipsen-xgot-for-smoke.diff	2005-04-09 22:42:58 UTC (rev 995)
+++ trunk/packages/kdebindings/debian/patches/051-mipsen-xgot-for-smoke.diff	2005-04-10 00:59:18 UTC (rev 996)
@@ -0,0 +1,30 @@
+--- a/configure.in.in
++++ b/configure.in.in
+@@ -263,3 +263,7 @@
+ 
+ dnl remove when fixed
+ DO_NOT_COMPILE="$DO_NOT_COMPILE dcopjava qtsharp"
++
++dnl Create AM_CONDITIONAL for mips and mipsel
++AM_CONDITIONAL([needs_xgot], [arch=`dpkg-architecture -qDEB_HOST_ARCH`;
++			      test "$arch" = "mips" || test "$arch" = "mipsel"])
+--- a/smoke/qt/Makefile.am
++++ b/smoke/qt/Makefile.am
+@@ -18,3 +18,7 @@
+ 
+ smokedata.cpp:
+ 	perl generate.pl
++
++if needs_xgot
++    libsmokeqt_la_CXXFLAGS = -Wa,-xgot
++endif
+--- a/smoke/kde/Makefile.am
++++ b/smoke/kde/Makefile.am
+@@ -18,3 +18,7 @@
+  
+ smokedata.cpp:
+ 	perl generate.pl
++
++if needs_xgot
++    # libsmokeqt_la_CXXFLAGS = -Wa,-xgot
++endif