[Pkg-gnupg-commit] r179 - in /gnupg/trunk/debian: changelog patches/00list patches/mips_gcc4.4.dpatch

[thijs at users.alioth.debian.org]

Author: thijs
Date: Tue May 25 18:55:37 2010
New Revision: 179

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=179
Log:
debian/patches/mips_gcc4.4: added to fix build failure on
mips(el) due to the removal of the 'h' constraint for MIPS
in gcc-4.4.x versions. Urgency high for fixing ftbfs.
Thanks Florian Fainelli for the patch.

Added:
    gnupg/trunk/debian/patches/mips_gcc4.4.dpatch   (with props)
Modified:
    gnupg/trunk/debian/changelog
    gnupg/trunk/debian/patches/00list

Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=179&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Tue May 25 18:55:37 2010
@@ -1,3 +1,12 @@
+gnupg (1.4.10-4) unstable; urgency=high
+
+  * debian/patches/mips_gcc4.4: added to fix build failure on
+    mips(el) due to the removal of the 'h' constraint for MIPS
+    in gcc-4.4.x versions. Urgency high for fixing ftbfs.
+    Thanks Florian Fainelli for the patch.
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Tue, 25 May 2010 20:54:22 +0200
+
 gnupg (1.4.10-3) unstable; urgency=low
 
   [ Daniel Leidert (dale) ]

Modified: gnupg/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/00list?rev=179&op=diff
==============================================================================
--- gnupg/trunk/debian/patches/00list (original)
+++ gnupg/trunk/debian/patches/00list Tue May 25 18:55:37 2010
@@ -1,4 +1,3 @@
-# currently empty
 489225_catch_expired_primary_key_with_valid_subkey
 551709_fix_info_link_entry
 553175_document_primary_uid_sign
@@ -7,3 +6,4 @@
 567580_menu_prompt_reflects_program
 567593_improve_info_and_faq
 fix_infinite_loop_r5264
+mips_gcc4.4

Added: gnupg/trunk/debian/patches/mips_gcc4.4.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/mips_gcc4.4.dpatch?rev=179&op=file
==============================================================================
--- gnupg/trunk/debian/patches/mips_gcc4.4.dpatch (added)
+++ gnupg/trunk/debian/patches/mips_gcc4.4.dpatch Tue May 25 18:55:37 2010
@@ -1,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## mips_gcc4.4 by Florian Fainelli <florian at alphacore.org>
+##
+## 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.debian.org/debian-mips/2010/05/msg00032.html>
+## DP: <URL:https://bugs.g10code.com/gnupg/issue1231>
+
+ at DPATCH@
+Index: gnupg-1.4.10/mpi/longlong.h
+===================================================================
+--- gnupg-1.4.10.orig/mpi/longlong.h	2008-12-11 17:39:43.000000000 +0100
++++ gnupg-1.4.10/mpi/longlong.h	2010-03-27 14:27:53.000000000 +0100
+@@ -706,18 +706,35 @@
+ #endif /* __m88110__ */
+ #endif /* __m88000__ */
+ 
++/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
++#if defined (__GNUC__) && defined (__GNUC_MINOR__)
++#define __GNUC_PREREQ(maj, min) \
++	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
++#else
++#define __GNUC_PREREQ(maj, min)  0
++#endif
++
+ /***************************************
+  **************  MIPS  *****************
+  ***************************************/
+ #if defined (__mips__) && W_TYPE_SIZE == 32
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if __GNUC_PREREQ (4,4)
++#define umul_ppmm(w1, w0, u, v) \
++  do {                                                                 \
++	UDItype __ll = (UDItype)(u) * (v);                                 \
++	w1 = __ll >> 32;                                                   \
++	w0 = __ll;                                                         \
++  } while (0)
++#endif
++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7)
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("multu %2,%3"                                                \
+ 	   : "=l" ((USItype)(w0)),                                      \
+ 	     "=h" ((USItype)(w1))                                       \
+ 	   : "d" ((USItype)(u)),                                        \
+ 	     "d" ((USItype)(v)))
+-#else
++#endif
++#if !defined (umul_ppmm)
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("multu %2,%3 \n" \
+ 	   "mflo %0 \n"     \

Propchange: gnupg/trunk/debian/patches/mips_gcc4.4.dpatch
------------------------------------------------------------------------------
    svn:executable = *