From 45201bf245856954cb8368c328e54773a0a81156 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 20 Sep 2018 18:59:57 +0100 Subject: [PATCH] gnu: hdf5-parallel-openmpi: Really enable parallel build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fix ensures that the H5_HAVE_PARALLEL identifier is correctly set in the file H5pubconf.h. * gnu/packages/maths.scm (hdf5-parallel-openmpi)[arguments]: Add the "--enable-parallel" flag to the list of configure flags. Remove the incompatible "--enable-cxx" flag. Add 'mpi-setup' phase. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 30f1610c1d..636b485260 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1037,10 +1037,13 @@ Swath).") `(("mpi" ,openmpi) ,@(package-inputs hdf5))) (arguments - (substitute-keyword-arguments `(#:configure-flags '("--enable-parallel") - ,@(package-arguments hdf5)) + (substitute-keyword-arguments (package-arguments hdf5) + ((#:configure-flags flags) + ``("--enable-parallel" ,@(delete "--enable-cxx" ,flags))) ((#:phases phases) `(modify-phases ,phases + (add-after 'build 'mpi-setup + ,%openmpi-setup) (add-before 'check 'patch-tests (lambda _ ;; OpenMPI's mpirun will exit with non-zero status if it