[Pkg-ofed-commits] [infinipath-psm] 01/01: Fix FTBFS in i386. (Closes: #832625).

[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 7051a1dbffbac7e5008a850b55d29066512aa638
Author: Ana Beatriz Guerrero Lopez <ana at debian.org>
Date:   Wed Jul 27 23:50:13 2016 +0200

    Fix FTBFS in i386. (Closes: #832625).
---
 debian/changelog                  |  6 ++++++
 debian/libpsm-infinipath1.symbols |  2 +-
 debian/patches/fix_i386.patch     | 20 ++++++++++++++++++++
 debian/patches/series             |  1 +
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 532c3b7..db31f2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+infinipath-psm (3.3+19.g67c0807.open-3) unstable; urgency=medium
+
+  * Fix FTBFS in i386. (Closes: #832625).
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Wed, 27 Jul 2016 23:48:47 +0200
+
 infinipath-psm (3.3+19.g67c0807.open-2) unstable; urgency=medium
 
   * Improve architecture detection. (Closes: #807149)
diff --git a/debian/libpsm-infinipath1.symbols b/debian/libpsm-infinipath1.symbols
index b9292ba..505543e 100644
--- a/debian/libpsm-infinipath1.symbols
+++ b/debian/libpsm-infinipath1.symbols
@@ -32,7 +32,7 @@ libinfinipath.so.4 libpsm-infinipath1 #MINVER#
  ipath_context_open at Base 3.3+7.gec1d6d2
  ipath_disarm_bufs at Base 3.3+7.gec1d6d2
  ipath_dwordcpy at Base 3.3+7.gec1d6d2
- ipath_dwordcpy_safe at Base 3.3+7.gec1d6d2
+ (arch=amd64)ipath_dwordcpy_safe at Base 3.3+7.gec1d6d2
  ipath_event_ack at Base 3.3+7.gec1d6d2
  ipath_flash_csum at Base 3.3+7.gec1d6d2
  ipath_flush_egr_bufs at Base 3.3+7.gec1d6d2
diff --git a/debian/patches/fix_i386.patch b/debian/patches/fix_i386.patch
new file mode 100644
index 0000000..9066f67
--- /dev/null
+++ b/debian/patches/fix_i386.patch
@@ -0,0 +1,20 @@
+Description: fix for building in i386
+
+Author: Ana Guerrero Lopez <ana at ekaia.org>
+Bug-Debian: https://bugs.debian.org/832625
+Last-Update: 2016-07-27
+Forwarded: no
+
+Index: infinipath-psm/ptl_am/am_reqrep_shmem.c
+===================================================================
+--- infinipath-psm.orig/ptl_am/am_reqrep_shmem.c
++++ infinipath-psm/ptl_am/am_reqrep_shmem.c
+@@ -542,7 +542,7 @@ psmi_shm_attach(psm_ep_t ep, int *shmidx
+ 
+ 	ep->amsh_dirpage->is_init = 1;
+ 	_IPATH_PRDBG("Mapped and initialized shm object control page at %p,"
+-                    "size=%ld, kcopy minor is %d (mode=%s)\n", mapptr,
++                    "size=%zu, kcopy minor is %d (mode=%s)\n", mapptr,
+ 		    segsz, kcopy_minor,
+ 		    psmi_kassist_getmode(ep->psmi_kassist_mode));
+     }
diff --git a/debian/patches/series b/debian/patches/series
index edb72e5..ec5c9de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Initialize-variables.patch
 0002-Fix-a-few-typos.patch
 fix_gcc6.patch
+fix_i386.patch

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