[Pkg-gnutls-commits] r836 - in /packages/libgcrypt11/trunk/debian: changelog patches/20_ftbfsmips.diff patches/series

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Wed Feb  3 18:03:10 2010
New Revision: 836

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=836
Log:
Fix FTBFS on mips(el). #561475

Added:
    packages/libgcrypt11/trunk/debian/patches/20_ftbfsmips.diff
Modified:
    packages/libgcrypt11/trunk/debian/changelog
    packages/libgcrypt11/trunk/debian/patches/series

Modified: packages/libgcrypt11/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/debian/changelog?rev=836&op=diff
==============================================================================
--- packages/libgcrypt11/trunk/debian/changelog (original)
+++ packages/libgcrypt11/trunk/debian/changelog Wed Feb  3 18:03:10 2010
@@ -1,8 +1,8 @@
-libgcrypt11 (1.4.5-2) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Andreas Metzler <ametzler at debian.org>  Sat, 12 Dec 2009 11:04:51 +0100
+libgcrypt11 (1.4.5-2) unstable; urgency=low
+
+  * Fix FTBFS on mips(el). Thank's Aurelien Jarno! Closes: #561475
+
+ -- Andreas Metzler <ametzler at debian.org>  Wed, 03 Feb 2010 19:02:07 +0100
 
 libgcrypt11 (1.4.5-1) unstable; urgency=low
 

Added: packages/libgcrypt11/trunk/debian/patches/20_ftbfsmips.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/debian/patches/20_ftbfsmips.diff?rev=836&op=file
==============================================================================
--- packages/libgcrypt11/trunk/debian/patches/20_ftbfsmips.diff (added)
+++ packages/libgcrypt11/trunk/debian/patches/20_ftbfsmips.diff Wed Feb  3 18:03:10 2010
@@ -1,0 +1,63 @@
+From: Aurelien Jarno <aurel32 at debian.org>
+To: Debian Bug Tracking System <submit at bugs.debian.org>
+Message-ID: <20091217133201.16090.92884.reportbug at mipsel.aurel32.net>
+Date: Thu, 17 Dec 2009 14:32:01 +0100
+Subject: Bug#561475: libgcrypt11/mips(el): FTBFS with gcc-4.4
+
+Package: libgcrypt11
+Version: 1.4.1-1
+Severity: serious
+Tags: patch
+Justification: fails to build from source
+
+mpfr fails to build on mips(el) with gcc-4.4. A full build log can be
+found here:
+https://buildd.debian.org/fetch.cgi?pkg=libgcrypt11&arch=mipsel&ver=1.4.5-1&stamp=1260977092&file=log&as=raw
+
+This is due to a change in GCC 4.4, the h asm constraint is not 
+supported anymore on mips. For more details please have a look at:
+http://gcc.gnu.org/gcc-4.4/changes.html
+
+The patch below fixes the problem by implementing the solution
+recommended by the previous web page. With it libgcrypt11 builds 
+successfully.
+
+--- libgcrypt11-1.4.5.orig/mpi/longlong.h
++++ libgcrypt11-1.4.5/mpi/longlong.h
+@@ -714,7 +714,15 @@ extern USItype __udiv_qrnnd ();
+  **************  MIPS  *****************
+  ***************************************/
+ #if defined (__mips__) && W_TYPE_SIZE == 32
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
++#define umul_ppmm(w1, w0, u, v) \
++  do {                                                                  \
++    UDItype _r;                                                         \
++    _r = (UDItype) u * v;                                               \
++    (w1) = _r >> 32;                                                    \
++    (w0) = (USItype) _r;                                                \
++  } while (0)
++#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("multu %2,%3"                                                \
+ 	   : "=l" ((USItype)(w0)),                                      \
+@@ -739,7 +747,16 @@ extern USItype __udiv_qrnnd ();
+  **************  MIPS/64  **************
+  ***************************************/
+ #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
++typedef unsigned int UTItype __attribute__ ((mode (TI)));
++#define umul_ppmm(w1, w0, u, v) \
++  do {                                                                 \
++    UTItype _r;                                                        \
++    _r = (UTItype) u * v;                                              \
++    (w1) = _r >> 64;                                                   \
++    (w0) = (UDItype) _r;                                               \
++  } while (0)
++#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("dmultu %2,%3"                                               \
+ 	   : "=l" ((UDItype)(w0)),                                      \
+
+

Modified: packages/libgcrypt11/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/debian/patches/series?rev=836&op=diff
==============================================================================
--- packages/libgcrypt11/trunk/debian/patches/series (original)
+++ packages/libgcrypt11/trunk/debian/patches/series Wed Feb  3 18:03:10 2010
@@ -1,1 +1,2 @@
 12_lessdeps_libgcrypt-config.diff
+20_ftbfsmips.diff