Package: partimage Version: 0.6.4-14 Severity: normal Tags: patch When building 'partimage' on ppc64/unstable, I get the following error:
g++ -DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" -D_REENTRANT -D_FILE_OFFSET_BITS=64 -I. -I. -I../../.. -I../../.. -I../../../src/client -I../../../src/shared -I/usr/include/slang -Wno-deprecated -I/usr/include/openssl -Wall -g -Wall -O2 -c -o fs_xfs.o fs_xfs.cpp fs_xfs.h:112: error: conflicting declaration 'typedef long long int __int64_t' /usr/include/bits/types.h:47: error: '__int64_t' has a previous declaration as 'typedef long int __int64_t' fs_xfs.h:113: error: conflicting declaration 'typedef long long unsigned int __uint64_t' /usr/include/bits/types.h:48: error: '__uint64_t' has a previous declaration as 'typedef long unsigned int __uint64_t' make[5]: *** [fs_xfs.o] Error 1 make[5]: Leaving directory `/partimage-0.6.4/src/client/fs' With the attached patch 'partimage' can be compiled on ppc64. Regards Andreas Jochens diff -urN ../tmp-orig/partimage-0.6.4/debian/patches/xfs.diff ./debian/patches/xfs.diff --- ../tmp-orig/partimage-0.6.4/debian/patches/xfs.diff 2006-04-06 10:27:02.000000000 +0000 +++ ./debian/patches/xfs.diff 2006-04-06 10:15:36.000000000 +0000 @@ -5,7 +5,7 @@ typedef signed int __int32_t; typedef unsigned int __uint32_t; -#ifdef __ia64__ -+#if defined(__alpha__) || defined(__ia64__) || defined(__x86_64__) ++#if defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__) typedef signed long int __int64_t; typedef unsigned long int __uint64_t; -#elif __alpha__ @@ -14,3 +14,15 @@ #else typedef signed long long int __int64_t; typedef unsigned long long int __uint64_t; +@@ -157,10 +154,7 @@ + typedef __uint64_t xfs_dfiloff_t; // block number in a file + typedef __uint64_t xfs_dfilblks_t; // number of blocks in a file + +-#ifdef __ia64__ +-typedef unsigned long __u64; +-typedef signed long __s64; +-#elif __alpha__ ++#if defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__) + typedef unsigned long __u64; + typedef signed long __s64; + #else -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
