[Pkg-crosswire-commits] [sword] 01/02: patch from Fernando Seiti Furusato to fix ppc64

[Daniel Glassey]

This is an automated email from the git hooks/post-receive script.

wdg pushed a commit to branch master
in repository sword.

commit 110ff2dadc82a8df00ef6089448465743dfcd89b
Author: Daniel Glassey <wdg at debian.org>
Date:   Wed Sep 7 15:01:31 2016 -0500

    patch from Fernando Seiti Furusato to fix ppc64
---
 debian/changelog                 |  7 +++++++
 debian/patches/series            |  1 +
 debian/patches/sword-ppc64.patch | 24 ++++++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9f4eb5b..fac6ffa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sword (1.7.3+dfsg-9) UNRELEASED; urgency=medium
+
+  * d/patches/sword-ppc64.patch: patch to fix ppc64
+      thanks to Fernando Seiti Furusato, Closes: #808346
+
+ -- Daniel Glassey <wdg at debian.org>  Wed, 07 Sep 2016 14:05:14 -0500
+
 sword (1.7.3+dfsg-8) unstable; urgency=medium
 
   [ Daniel Glassey ]
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 at 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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-crosswire/sword.git