[Pkg-gnupg-commit] r191 - in /gnupg/branches/experimental/debian: changelog patches/00list patches/mips_gcc4.4.dpatch

[thijs at users.alioth.debian.org]

Author: thijs
Date: Thu Oct 28 20:09:54 2010
New Revision: 191

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=191
Log:
Apply patch based on Werner Koch's work that (again)
resolves a build failure on mips(el); issue addressed
in 1.4.10-4 was only partly solved upstream.

Added:
    gnupg/branches/experimental/debian/patches/mips_gcc4.4.dpatch
Modified:
    gnupg/branches/experimental/debian/changelog
    gnupg/branches/experimental/debian/patches/00list

Modified: gnupg/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/changelog?rev=191&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/changelog (original)
+++ gnupg/branches/experimental/debian/changelog Thu Oct 28 20:09:54 2010
@@ -2,8 +2,11 @@
 
   * Update standards-version to 3.9.1, no changes needed.
   * Add comment line in empty debian/patches/00list.
-
- -- Thijs Kinkhorst <thijs at debian.org>  Tue, 26 Oct 2010 23:58:01 +0200
+  * Apply patch based on Werner Koch's work that (again)
+    resolves a build failure on mips(el); issue addressed
+    in 1.4.10-4 was only partly solved upstream.
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Thu, 28 Oct 2010 22:06:17 +0200
 
 gnupg (1.4.11-1) experimental; urgency=low
 

Modified: gnupg/branches/experimental/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/patches/00list?rev=191&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/patches/00list (original)
+++ gnupg/branches/experimental/debian/patches/00list Thu Oct 28 20:09:54 2010
@@ -1,1 +1,1 @@
-# empty
+mips_gcc4.4

Added: gnupg/branches/experimental/debian/patches/mips_gcc4.4.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/patches/mips_gcc4.4.dpatch?rev=191&op=file
==============================================================================
--- gnupg/branches/experimental/debian/patches/mips_gcc4.4.dpatch (added)
+++ gnupg/branches/experimental/debian/patches/mips_gcc4.4.dpatch Thu Oct 28 20:09:54 2010
@@ -1,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## mips_gcc4.4 by Werner Koch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build fails on mips(el) due to changes the removal 
+## DP: of the 'h' constraint for MIPS in gcc-4.4.x versions.
+## DP: <URL:http://lists.gnupg.org/pipermail/gnupg-devel/2010-October/025805.html>
+
+ at DPATCH@
+
+diff -Nur gnupg-1.4.11.orig/mpi/longlong.h gnupg-1.4.11/mpi/longlong.h
+--- gnupg-1.4.11.orig/mpi/longlong.h	2010-06-01 13:01:46.000000000 +0200
++++ gnupg-1.4.11/mpi/longlong.h	2010-10-28 22:01:19.000000000 +0200
+@@ -710,12 +710,13 @@
+  **************  MIPS  *****************
+  ***************************************/
+ #if defined (__mips__) && W_TYPE_SIZE == 32
+-#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR >= 4 )
+-#define umul_ppmm(w1, w0, u, v)                                         \
++#if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
++#define umul_ppmm(w1, w0, u, v) \
+   do {                                                                  \
+-    UDItype __ll = (UDItype)(u) * (v);                                  \
+-    w1 = __ll >> 32;                                                    \
+-    w0 = __ll;                                                          \
++    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)                                         \
+@@ -742,7 +743,16 @@
+  **************  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 if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("dmultu %2,%3"                                               \
+ 	   : "=l" ((UDItype)(w0)),                                      \