[Pkg-ofed-commits] [infinipath-psm] 02/02: Fix FTBFS with gcc 6.0. (Closes: #811940)

[Ana Beatriz Guerrero López]

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

ana pushed a commit to branch debian/master
in repository infinipath-psm.

commit 953f1133f36cda53c90d95b9888936b9f0f83870
Author: Ana Beatriz Guerrero Lopez <ana at debian.org>
Date:   Wed Jul 27 00:57:39 2016 +0200

    Fix FTBFS with gcc 6.0. (Closes: #811940)
---
 debian/changelog              |  5 +++--
 debian/patches/fix_gcc6.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91f45c3..532c3b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-infinipath-psm (3.3+19.g67c0807.open-2) UNRELEASED; urgency=medium
+infinipath-psm (3.3+19.g67c0807.open-2) unstable; urgency=medium
 
   * Improve architecture detection. (Closes: #807149)
   * Add myself to Uploaders.
+  * Fix FTBFS with gcc 6.0. (Closes: #811940)
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 04 Apr 2016 10:18:09 +0200
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Wed, 27 Jul 2016 00:57:22 +0200
 
 infinipath-psm (3.3+19.g67c0807.open-1) unstable; urgency=medium
 
diff --git a/debian/patches/fix_gcc6.patch b/debian/patches/fix_gcc6.patch
new file mode 100644
index 0000000..fe141b3
--- /dev/null
+++ b/debian/patches/fix_gcc6.patch
@@ -0,0 +1,31 @@
+Description: fix for building with GCC 6.0
+This patch fixes the following errors:
+
+psm_diags.c: In function 'memcpy_check_size':
+psm_diags.c:286:7: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]
+       if (dst) psmi_free(dst);
+       ^~
+psm_diags.c:284:5: note: ...this 'if' clause, but it is not
+     if (src == NULL || dst == NULL)
+     ^~
+
+Author: Ana Guerrero Lopez <ana at ekaia.org>
+Bug-Debian: https://bugs.debian.org/811940
+Last-Update: 2016-07-26
+Forwarded: no
+
+--- infinipath-psm-3.3+19.g67c0807.open.orig/psm_diags.c
++++ infinipath-psm-3.3+19.g67c0807.open/psm_diags.c
+@@ -281,10 +281,11 @@ memcpy_check_size (memcpy_fn_t fn, int *
+   if (USE_MALLOC) {
+     src = psmi_malloc(PSMI_EP_NONE, UNDEFINED, size);
+     dst = psmi_malloc(PSMI_EP_NONE, UNDEFINED, size);
+-    if (src == NULL || dst == NULL) 
++    if (src == NULL || dst == NULL) {
+       if (src) psmi_free(src);
+       if (dst) psmi_free(dst);
+       return -1;
++	}
+   }
+   else {
+     void *src_p = NULL, *dst_p = NULL;
diff --git a/debian/patches/series b/debian/patches/series
index 0c52896..edb72e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Initialize-variables.patch
 0002-Fix-a-few-typos.patch
+fix_gcc6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/infinipath-psm.git