diff options
| author | Daniel Glassey <wdg@debian.org> | 2016-09-07 15:01:31 -0500 |
|---|---|---|
| committer | Daniel Glassey <wdg@debian.org> | 2016-09-07 15:01:31 -0500 |
| commit | 110ff2dadc82a8df00ef6089448465743dfcd89b (patch) | |
| tree | 779c9ef499db99527414245884b2d38edcd47968 /debian/patches | |
| parent | 40b5ab30b5a955b09d43c335cc4e3142fd2722dc (diff) | |
patch from Fernando Seiti Furusato to fix ppc64
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/sword-ppc64.patch | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index 8aff1b1..7a831e8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ abicompare.patch multiarch.patch selectively_disable_compiler_warnings.patch runtests.patch +sword-ppc64.patch diff --git a/debian/patches/sword-ppc64.patch b/debian/patches/sword-ppc64.patch new file mode 100644 index 0000000..4fc1cf5 --- /dev/null +++ b/debian/patches/sword-ppc64.patch @@ -0,0 +1,24 @@ +Description: fix Type definition conflict with asm/types.h for ppc64 +Author: Fernando Seiti Furusato <ferseiti@br.ibm.com> + +Index: sword-1.7.3+dfsg/include/sysdata.h +=================================================================== +--- sword-1.7.3+dfsg.orig/include/sysdata.h ++++ sword-1.7.3+dfsg/include/sysdata.h +@@ -40,12 +40,15 @@ typedef unsigned short __u16; + typedef signed int __s32; + typedef unsigned int __u32; + +-#ifdef __GNUC__ ++#if defined(__GNUC__) && !defined(__powerpc64__) + __extension__ typedef __signed__ long long __s64; + __extension__ typedef unsigned long long __u64; + #elif defined(__BORLANDC__) + typedef signed __int64 __s64; + typedef unsigned __int64 __u64; ++#elif defined(__powerpc64__) ++typedef __signed__ long __s64; ++typedef unsigned long __u64; + #else + typedef signed long long __s64; + typedef unsigned long long __u64; |