Rafael Laboissiere <rafael@laboissiere.net> writes: > * Sébastien Villemot <sebastien.villemot@ens.fr> [2012-08-09 12:19]: > >> I have just tested the solution that Thomas had implemented for Squeeze, >> which was: >> >> - make liboctave-dev depend on libhdf5-dev | libhdf5-openmpi-dev | >> libhdf5-mpich2-dev >> >> - add -I/usr/include/mpi to XTRA_CXXFLAGS in mkoctfile >> >> This change should not introduce new bugs. >> >> [snip] >> >> Thomas, Rafael: what do you think? Am I missing something? > > It sounds good but, please, commit your changes to the experimental > branch, such that we can test your solution. I'd rather have it on the master branch, because I think this change should make it into Wheezy if it is technically sound and accepted by all of us. Please find the patch attached in the meantime.
commit 9161c3f0c23c6d5527da0f2bd8343595ec70d064
Author: Sébastien Villemot <sebastien.villemot@ens.fr>
Date: Fri Aug 10 12:01:32 2012 +0200
Make liboctave-dev coinstallable with all HDF5 variants
diff --git a/debian/control b/debian/control
index ed43e0d..2aaed93 100644
--- a/debian/control
+++ b/debian/control
@@ -126,7 +126,8 @@ Package: liboctave-dev
Architecture: any
Depends: liboctave1 (= ${binary:Version}), octave (= ${binary:Version}), ${misc:Depends},
libreadline-dev | libreadline6-dev | libreadline5-dev, libncurses5-dev,
- libhdf5-dev (>= 1.8.8), libgl1-mesa-dev | libgl-dev,
+ libhdf5-dev (>= 1.8.8) | libhdf5-openmpi-dev (>= 1.8.8) | libhdf5-mpich2-dev (>= 1.8.8),
+ libgl1-mesa-dev | libgl-dev,
libblas-dev (>=1.2-7), liblapack-dev (>=3.2.1-7), libfftw3-dev, gfortran, gcc, g++
Conflicts: octave3.2-headers
Replaces: octave3.2-headers
diff --git a/debian/patches/mkoctfile-openmpi.diff b/debian/patches/mkoctfile-openmpi.diff
new file mode 100644
index 0000000..620ec01
--- /dev/null
+++ b/debian/patches/mkoctfile-openmpi.diff
@@ -0,0 +1,11 @@
+--- a/src/mkoctfile.in
++++ b/src/mkoctfile.in
+@@ -77,7 +77,7 @@
+ : ${CXXFLAGS=%OCTAVE_CONF_CXXFLAGS%}
+ : ${CXXPICFLAG=%OCTAVE_CONF_CXXPICFLAG%}
+ : ${XTRA_CFLAGS=%OCTAVE_CONF_XTRA_CFLAGS%}
+-: ${XTRA_CXXFLAGS=%OCTAVE_CONF_XTRA_CXXFLAGS%}
++: ${XTRA_CXXFLAGS=-I/usr/include/mpi %OCTAVE_CONF_XTRA_CXXFLAGS%}
+
+ : ${DEPEND_FLAGS=%OCTAVE_CONF_DEPEND_FLAGS%}
+ : ${DEPEND_EXTRA_SED_PATTERN=%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%}
diff --git a/debian/patches/series b/debian/patches/series
index 0799947..0bbc6a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ add_info_dir_categories
correct_typos
use_system_gl2ps
drop_version_from_mkoctfile_function_call
+mkoctfile-openmpi.diff
-- .''`. Sébastien Villemot : :' : Debian Maintainer `. `' http://www.dynare.org/sebastien `- GPG Key: 4096R/381A7594
Attachment:
pgpf7TK0b0Dma.pgp
Description: PGP signature