[Pkg-scicomp-commits] gmp/trunk/debian

[Steven Michael Robbins]

SVN commit 4346 by smr:

Fix build failures for some architectures.

 M  +10 -0     gmp/trunk/debian/changelog  
 M  +4 -4      gmp/trunk/debian/control  
 M  +7 -3      gmp/trunk/debian/gmp.h  
 M  +1 -1      gmp/trunk/debian/rules  


--- gmp/trunk/debian/changelog #4345:4346
@@ -1,3 +1,13 @@
+gmp (2:4.2.4+dfsg-6) experimental; urgency=low
+
+  * gmp.h: Add cases for arm, hppa, sparc.  
+  
+  * control:
+  * rules: Do not build multilibs for i386, powerpc, s390.  Closes:
+    #522460.
+
+ -- Steve M. Robbins <smr at debian.org>  Fri, 03 Apr 2009 23:54:21 -0500
+
 gmp (2:4.2.4+dfsg-5) experimental; urgency=low
 
   * rules: Support bi-arch builds (32 and 64 bit) where possible.  
--- gmp/trunk/debian/control #4345:4346
@@ -2,7 +2,7 @@
 Homepage: http://gmplib.org/
 Section: libs
 Priority: optional
-Build-Depends: m4, debhelper (>= 7), quilt, binutils (>= 2.18.1~cvs20080103-2) [mips mipsel], gcc-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc], g++-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc]
+Build-Depends: m4, debhelper (>= 7), quilt, binutils (>= 2.18.1~cvs20080103-2) [mips mipsel], gcc-multilib [amd64 kfreebsd-amd64 mips mipsel ppc64 sparc], g++-multilib [amd64 kfreebsd-amd64 mips mipsel ppc64 sparc]
 Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
 Uploaders: Steve M. Robbins <smr at debian.org>
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/gmp/trunk/?rev=0&sc=0
@@ -102,7 +102,7 @@
 Package: lib64gmp3
 Section: libs
 Priority: optional
-Architecture: sparc s390 i386 powerpc mips mipsel
+Architecture: sparc mips mipsel
 Depends: ${shlibs:Depends}
 Description: Multiprecision arithmetic library (64bit library)
  GNU MP is a programmer's library for arbitrary precision
@@ -116,7 +116,7 @@
 Package: lib64gmpxx4
 Section: libs
 Priority: optional
-Architecture: sparc s390 i386 powerpc mips mipsel
+Architecture: sparc mips mipsel
 Depends: ${shlibs:Depends}
 Description: Multiprecision arithmetic library (C++ bindings, 64bit)
  GNU MP is a programmer's library for arbitrary precision
@@ -127,7 +127,7 @@
 Package: lib64gmp3-dev
 Section: libdevel
 Priority: optional
-Architecture: sparc s390 i386 powerpc mips mipsel
+Architecture: sparc mips mipsel
 Depends: libgmp3-dev (= ${binary:Version}), lib64gmp3 (= ${binary:Version}), lib64gmpxx4 (= ${binary:Version})
 Suggests: libgmp3-doc, libmpfr-dev
 Description: Multiprecision arithmetic library developers tools (64bit)
--- gmp/trunk/debian/gmp.h #4345:4346
@@ -35,18 +35,22 @@
 #endif
 #define gmp_wrapper_h
 
-#if defined(__i386__)
+#if defined(__arm__)
+#include "gmp-arm.h"
+#elif defined(__i386__)
 #include "gmp-i386.h"
 #elif defined(__ia64__)
 #include "gmp-ia64.h"
+#elif defined(__hppa__)
+#include "gmp-hppa.h"
 #elif defined(__powerpc64__)
 #include "gmp-ppc64.h"
 #elif defined(__powerpc__)
 #include "gmp-ppc.h"
-#elif defined(__s390x__)
-#include "gmp-s390x.h"
 #elif defined(__s390__)
 #include "gmp-s390.h"
+#elif defined(__sparc__)
+#include "gmp-sparc.h"
 #elif defined(__x86_64__)
 #include "gmp-x86_64.h"
 #elif defined(__alpha__)
--- gmp/trunk/debian/rules #4345:4346
@@ -49,7 +49,7 @@
   m32=-m32
 endif
 
-64-ARCHS=s390 sparc i386 powerpc mips mipsel
+64-ARCHS=sparc mips mipsel
 ifneq (,$(findstring $(DEB_HOST_ARCH), $(64-ARCHS)))
   EXTRA_INSTALL=install64
   # MIPS doesn't use -m64