[med-svn] [plink1.9] 01/02: Add an upstream patch to fix FTBFS for non-amd64 builds (Closes: #811910)

[Dylan Aïssi]

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

bob.dybian-guest pushed a commit to branch master
in repository plink1.9.

commit d7f81c0d7a5755efc086629fffd04a87b4b99f94
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date:   Tue Aug 30 22:14:39 2016 +0200

    Add an upstream patch to fix FTBFS for non-amd64 builds (Closes: #811910)
---
 debian/changelog                       |  6 ++++++
 debian/patches/03_Fix_FTBFS_GCC6.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index da753da..65479e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+plink1.9 (1.90~b3.40-160816-2) UNRELEASED; urgency=medium
+
+  * Add an upstream patch to fix FTBFS for non-amd64 builds (Closes: #811910)
+
+ -- Dylan Aïssi <bob.dybian at gmail.com>  Tue, 30 Aug 2016 22:11:27 +0200
+
 plink1.9 (1.90~b3.40-160816-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/03_Fix_FTBFS_GCC6.patch b/debian/patches/03_Fix_FTBFS_GCC6.patch
new file mode 100644
index 0000000..c5b49cb
--- /dev/null
+++ b/debian/patches/03_Fix_FTBFS_GCC6.patch
@@ -0,0 +1,27 @@
+Author: Christopher Chang
+Description: Fix FTBFS with GCC6 for non_amd64 builds.
+Last-Update: 2016-08-30
+Oirigin: https://github.com/chrchang/plink-ng/commit/5930c26c8db829ffb3397fd4a50bf75d574fc8a8
+
+--- a/plink_common.h
++++ b/plink_common.h
+@@ -108,11 +108,14 @@
+   #define CTZLU __builtin_ctzl
+   #define CLZLU __builtin_clzl
+   #ifndef __LP64__
+-    #ifndef uintptr_t
+-      #define uintptr_t unsigned long
+-    #endif
+-    #ifndef intptr_t
+-      #define intptr_t long
++    // attempt to patch GCC 6 build failure
++    #if (__GNUC__ <= 4) && (__GNUC_MINOR__ < 8)
++      #ifndef uintptr_t
++        #define uintptr_t unsigned long
++      #endif
++      #ifndef intptr_t
++        #define intptr_t long
++      #endif
+     #endif
+   #endif
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index e25033f..b3e1683 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_Fix_use_dynamic_linking.patch
 02_Activate_Stable_Build.patch
+03_Fix_FTBFS_GCC6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/plink1.9.git