[Pkg-octave-commit] [octave-openmpi-ext] 01/02: Fix FTBFS against openmpi 1.6
Sébastien Villemot
sebastien at alioth.debian.org
Mon Aug 19 16:20:01 UTC 2013
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository octave-openmpi-ext.
commit 5ab79281c7d3297462a9d88d894346ee6c00fbbc
Author: Sébastien Villemot <sebastien at debian.org>
Date: Mon Aug 19 18:08:29 2013 +0200
Fix FTBFS against openmpi 1.6
* openmpi-1.6.patch: new patch
* Tighten build dependency against libopenmpi-dev (the patch is not backwards
compatible)
---
debian/control | 2 +-
debian/patches/openmpi-1.6.patch | 28 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index e1652b9..bc0a55c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
Uploaders: Sébastien Villemot <sebastien at debian.org>,
Thomas Weber <tweber at debian.org>
Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>= 1.0.1),
- libopenmpi-dev, dh-exec, dpkg-dev (>= 1.16.1)
+ libopenmpi-dev (>= 1.6), dh-exec, dpkg-dev (>= 1.16.1)
Build-Conflicts: libmpich2-dev
Standards-Version: 3.9.4
Homepage: http://octave.sourceforge.net/openmpi_ext/
diff --git a/debian/patches/openmpi-1.6.patch b/debian/patches/openmpi-1.6.patch
new file mode 100644
index 0000000..63f7a61
--- /dev/null
+++ b/debian/patches/openmpi-1.6.patch
@@ -0,0 +1,28 @@
+Description: Fix FTBFS against OpenMPI 1.6
+Author: Sébastien Villemot <sebastien at debian.org>
+Bug: https://savannah.gnu.org/bugs/index.php?39816
+Last-Update: 2013-08-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/MPI_Iprobe.cc
++++ b/src/MPI_Iprobe.cc
+@@ -35,7 +35,7 @@
+ map.assign ("tag", tmp );
+ tmp = stat.MPI_ERROR;
+ map.assign ("err", tmp );
+- tmp = stat._count;
++ tmp = stat._ucount;
+ map.assign ("cnt", tmp);
+ tmp = stat._cancelled;
+ map.assign ("can", tmp);
+--- a/src/MPI_Probe.cc
++++ b/src/MPI_Probe.cc
+@@ -34,7 +34,7 @@
+ map.assign ("tag", tmp);
+ tmp = stat.MPI_ERROR;
+ map.assign ("err", tmp);
+- tmp = stat._count;
++ tmp = stat._ucount;
+ map.assign("cnt", tmp);
+ tmp = stat._cancelled;
+ map.assign("can", tmp);
diff --git a/debian/patches/series b/debian/patches/series
index 0ed9383..75f3731 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
autoload-yes.patch
+openmpi-1.6.patch
--
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-openmpi-ext.git
More information about the Pkg-octave-commit
mailing list