Hello community, here is the log from the commit of package cln for openSUSE:Factory checked in at 2011-11-28 12:53:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cln (Old) and /work/SRC/openSUSE:Factory/.cln.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cln", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/cln/cln.changes 2011-11-07 14:09:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cln.new/cln.changes 2011-11-28 12:53:22.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 28 02:07:36 CET 2011 - [email protected] + +- make it build on s390x + +------------------------------------------------------------------- New: ---- cln-s390x.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cln.spec ++++++ --- /var/tmp/diff_new_pack.NkicXI/_old 2011-11-28 12:53:24.000000000 +0100 +++ /var/tmp/diff_new_pack.NkicXI/_new 2011-11-28 12:53:24.000000000 +0100 @@ -26,6 +26,7 @@ Group: Productivity/Scientific/Math Source0: cln-%{version}.tar.bz2 Source1: pi.tar.gz +Patch0: cln-s390x.patch BuildRequires: gcc-c++ BuildRequires: gmp-devel BuildRequires: pkg-config @@ -84,6 +85,7 @@ %prep %setup -q -a 1 +%patch0 %build CFLAGS="-fno-unit-at-a-time" \ ++++++ cln-s390x.patch ++++++ --- include/cln/host_cpu.h.in +++ include/cln/host_cpu.h.in @@ -75,5 +75,9 @@ #undef __s390__ #endif +#ifndef __s390x__ +#undef __s390x__ +#endif + #endif /* _CL_HOST_CPU_CONFIG_H */ --- include/cln/object.h +++ 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(__sparc64__)) || defined(__hppa__) || defined(__arm__) || defined(__rs6000__) || defined(__m88k__) || defined(__convex__) || defined(__s390__) || defined(__sh__) +#if defined(__i386__) || defined(__mips__) || defined(__mipsel__) || (defined(__sparc__) && !defined(__sparc64__)) || defined(__hppa__) || defined(__arm__) || defined(__rs6000__) || defined(__m88k__) || defined(__convex__) || (defined(__s390__) && !defined(__s390x__)) || defined(__sh__) #define cl_word_alignment 4 #endif -#if defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__x86_64__) +#if defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__s390x__) || defined(__x86_64__) #define cl_word_alignment 8 #endif #if !defined(cl_word_alignment) --- include/cln/types.h +++ include/cln/types.h @@ -48,7 +48,7 @@ #undef HAVE_LONGLONG #endif #endif - #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__x86_64__)) + #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__s390x__) || defined(__x86_64__)) // 64 bit registers in hardware #define HAVE_FAST_LONGLONG #endif @@ -76,7 +76,7 @@ // Integer type used for counters. // Constraint: sizeof(uintC) >= sizeof(uintL) - #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__))) + #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__x86_64__))) #define intCsize long_bitsize typedef long sintC; typedef unsigned long uintC; @@ -88,7 +88,7 @@ // Integer type used for lfloat exponents. // Constraint: sizeof(uintE) >= sizeof(uintC) -#if (defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__) || defined(__i386__) || defined(__mips__) || defined(__rs6000__))) +#if (defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__x86_64__) || defined(__i386__) || defined(__mips__) || defined(__rs6000__))) #define intEsize 64 typedef sint64 sintE; typedef uint64 uintE; @@ -127,7 +127,7 @@ typedef int sintD; typedef unsigned int uintD; #else // we are not using GMP, so just guess something reasonable - #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__))) + #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__x86_64__))) #define intDsize 64 typedef sint64 sintD; typedef uint64 uintD; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
