From da55d91a420ab28629c71d250fc81c73e2a62074 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sun, 29 Mar 2020 21:51:36 -0400 Subject: [PATCH] Re-enable mpi-hs Switch MPI library dependency from OpenMPI to MPICH. (This is very likely fine since OpenMPI was added for mpi-hs.) We use MPICH since OpenMPI in Xenial does not support multi-threading yet. Closes #5278. --- build-constraints.yaml | 2 +- debian-bootstrap.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ef55000c..6e182c01 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -133,7 +133,7 @@ packages: - PyF "Erik Schnetter @eschnett": - - mpi-hs < 0 # https://github.com/commercialhaskell/stackage/issues/5278 + - mpi-hs "Yang Bo @Atry": - control-dsl < 0 # via doctest-discover diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index cb9556f3..05b9aa96 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -92,13 +92,13 @@ apt-get install -y \ libmono-2.0-dev \ libmp3lame-dev \ libmpfr-dev \ + libmpich-dev \ libmysqlclient-dev \ libncurses5-dev \ libnfc-dev \ liboath-dev \ libnotify-dev \ libopenal-dev \ - libopenmpi-dev \ libpango1.0-dev \ libpcap0.8-dev \ libpcre2-dev \