diff -u cln-1.3.2/include/cln/object.h cln-1.3.2/include/cln/object.h --- cln-1.3.2/include/cln/object.h +++ cln-1.3.2/include/cln/object.h @@ -22,10 +22,10 @@ #if defined(__m68k__) #define cl_word_alignment 2 #endif -#if defined(__i386__) || defined(__mips__) || defined(__mipsel__) || (defined(__sparc__) && !defined(__arch64__)) || defined(__hppa__) || defined(__arm__) || defined(__rs6000__) || defined(__m88k__) || defined(__convex__) || (defined(__s390__) && !defined(__s390x__)) || defined(__sh__) +#if defined(__i386__) || defined(__mips__) || defined(__mipsel__) || (defined(__sparc__) && !defined(__arch64__)) || defined(__hppa__) || defined(__arm__) || defined(__rs6000__) || defined(__m88k__) || defined(__convex__) || (defined(__s390__) && !defined(__s390x__)) || defined(__sh__) || (defined(__x86_64__) && defined(__ILP32__)) #define cl_word_alignment 4 #endif -#if defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__) || defined(__s390x__) +#if defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(__s390x__) #define cl_word_alignment 8 #endif #if !defined(cl_word_alignment) diff -u cln-1.3.2/debian/rules cln-1.3.2/debian/rules --- cln-1.3.2/debian/rules +++ cln-1.3.2/debian/rules @@ -5,7 +5,11 @@ version=$(shell expr `pwd` : '.*-\([0-9.]*\)') version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*') -build: +debian/autoreconf-stamp: + dh_autoreconf + touch $@ + +build: debian/autoreconf-stamp dh_testdir ./configure --prefix=/usr `dpkg-architecture -qDEB_HOST_GNU_TYPE` # * ARM: CLN's assembler support is not working properly (it was only @@ -27,6 +31,7 @@ clean: dh_testdir + dh_autoreconf_clean dh_clean -rm -f build [ ! -f Makefile ] || ${MAKE} distclean diff -u cln-1.3.2/debian/control cln-1.3.2/debian/control --- cln-1.3.2/debian/control +++ cln-1.3.2/debian/control @@ -2,7 +2,7 @@ Section: math Priority: optional Maintainer: Richard Kreckel -Build-Depends: debhelper (>= 6), libgmp-dev, texinfo +Build-Depends: debhelper (>= 6), libgmp-dev, texinfo, dh-autoreconf Standards-Version: 3.9.1 Homepage: http://www.ginac.de/CLN/ diff -u cln-1.3.2/debian/changelog cln-1.3.2/debian/changelog --- cln-1.3.2/debian/changelog +++ cln-1.3.2/debian/changelog @@ -1,3 +1,10 @@ +cln (1.3.2-1.2+x32) unreleased; urgency=low + + * Fix autoconf test checking whether mp_limb_t needs to be long long, + which is needed on x32. + + -- Daniel Schepler Fri, 15 Feb 2013 07:48:38 -0800 + cln (1.3.2-1.2) unstable; urgency=low * Non-maintainer upload. only in patch2: unchanged: --- cln-1.3.2.orig/m4/gmp.m4 +++ cln-1.3.2/m4/gmp.m4 @@ -52,7 +52,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include template struct Static_Assert; template<> struct Static_Assert { }; - Static_Assert sizeof(long)> check;]], [[]])], + Static_Assert<(sizeof(mp_limb_t) > sizeof(long))> check;]], [[]])], [cl_gmp_demands='GMP_DEMANDS_UINTD_LONG_LONG'], []) if test "x$cl_gmp_demands" = "xUNKNOWN"; then AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include