[python-escript] 01/01: Fix moved openmpi lib problem [#848787]

[Joel Fenwick]

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

jfenwick-guest pushed a commit to branch debian
in repository python-escript.

commit a75d1b94af8244693fe6df92153fa11c51a159c5
Author: Joel Fenwick <joelfenwick at uq.edu.au>
Date:   Thu Jan 5 13:30:46 2017 +1000

    Fix moved openmpi lib problem [#848787]
    
    Infer the location of the library directory from the include symlink
---
 debian/patches/fixopenmpiconf | 15 +++++++++++++++
 debian/patches/series         |  1 +
 2 files changed, 16 insertions(+)

diff --git a/debian/patches/fixopenmpiconf b/debian/patches/fixopenmpiconf
new file mode 100644
index 0000000..2de4c3c
--- /dev/null
+++ b/debian/patches/fixopenmpiconf
@@ -0,0 +1,15 @@
+--- a/scons/templates/sid_options.py
++++ b/scons/templates/sid_options.py
+@@ -21,7 +21,11 @@ escript_opts_version = 203
+ #cxx_extra = '-Wno-literal-suffix'
+ openmp = True
+ #mpi = 'OPENMPI'
+-mpi_prefix = '/usr/lib/openmpi'
++
++import os
++
++d_mpi_path = '/usr/include/openmpi'
++mpi_prefix = os.path.split(os.path.realpath(d_mpi_path))[0]
+ mpi_libs = ['mpi_cxx', 'mpi']
+ netcdf = True
+ #umfpack = True
diff --git a/debian/patches/series b/debian/patches/series
index 902a8d7..571df11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 nodatedoxygen
 rootintar
+fixopenmpiconf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-escript.git