Commit 09e875b4 authored by Nicholas Breen's avatar Nicholas Breen

- control: Add openmpi-bin to Build-Depends. (#837061)

- rules: Apply the OMPI_MCA_plm_rsh_agent workaround from #494046.  
parent 66642c5c
......@@ -3,8 +3,11 @@ gromacs (2016-3) unstable; urgency=medium
* rules: Adjust SIMD detection logic to set GMX_SIMD=None by default, and
enable it case-by-case only on those architectures where it's safe to
do so. (Closes: #834991)
* Work around OpenMPI 2 test failures: (Closes: #837061)
- control: Add openmpi-bin to Build-Depends.
- rules: Apply the OMPI_MCA_plm_rsh_agent workaround from #494046.
-- Nicholas Breen <nbreen@debian.org> Sun, 28 Aug 2016 13:19:18 -0700
-- Nicholas Breen <nbreen@debian.org> Thu, 08 Sep 2016 19:38:53 -0700
gromacs (2016-2) unstable; urgency=medium
......
......@@ -13,6 +13,7 @@ Build-Depends: cmake,
libopenmpi-dev (>= 1.10.2-7),
libtinyxml-dev,
libx11-dev,
openmpi-bin,
zlib1g-dev
Build-Depends-Indep: doxygen,
ghostscript,
......
......@@ -149,6 +149,8 @@ build-openmpi: configure-stamp
< debian/gromacs-parallel.README.Debian.in \
> debian/gromacs-openmpi.README.Debian
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=494046
OMPI_MCA_plm_rsh_agent=/bin/false
LD_LIBRARY_PATH=$(CURDIR)/build/openmpi/lib $(MAKE) -C build/openmpi check
LD_LIBRARY_PATH=$(CURDIR)/build/openmpi-dp/lib $(MAKE) -C build/openmpi-dp check
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment