From f9fa4fd518d0f49b3176603c4c6ccabf78fd2bcf Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Tue, 6 Aug 2019 19:13:28 +0100 Subject: OpenSSH necessary to use OpenMPI Until now, OpenMPI was being installed without any dependency. This was fine because it would indeed build. But the moment you tried loading something that depends on it (for example `mpi4py' through `astropy'), you would get an error complaining that SSH isn't present. With this commit, the pipeline now also installs OpenSSH to solve this problem. --- reproduce/software/make/high-level.mk | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'reproduce/software/make') diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 167f430..c175622 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -152,8 +152,9 @@ tarballs = $(foreach t, astrometry.net-$(astrometrynet-version).tar.gz \ libgit2-$(libgit2-version).tar.gz \ libxml2-$(libxml2-version).tar.gz \ netpbm-$(netpbm-version).tar.gz \ - openmpi-$(openmpi-version).tar.gz \ openblas-$(openblas-version).tar.gz \ + openmpi-$(openmpi-version).tar.gz \ + openssh-$(openssh-version).tar.gz \ pixman-$(pixman-version).tar.gz \ scamp-$(scamp-version).tar.lz \ scons-$(scons-version).tar.gz \ @@ -226,6 +227,7 @@ $(tarballs): $(tdir)/%: | $(lockdir) c=$(openmpi-checksum) majorver=$$(echo $(openmpi-version) | sed -e 's/\./ /g' | awk '{printf("%d.%d", $$1, $$2)}') w=https://download.open-mpi.org/release/open-mpi/v$$majorver/$* + elif [ $$n = openssh ]; then c=$(openssh-checksum); w=https://artfiles.org/openbsd/OpenSSH/portable elif [ $$n = pixman ]; then c=$(pixman-checksum); w=https://www.cairographics.org/releases elif [ $$n = scamp ]; then c=$(scamp-checksum); w=http://akhlaghi.org/reproduce-software elif [ $$n = scons ]; then @@ -479,11 +481,20 @@ $(ibidir)/openblas: $(tdir)/openblas-$(openblas-version).tar.gz && rm -rf OpenBLAS-$(openblas-version) \ && echo "OpenBLAS $(openblas-version)" > $@ -$(ibidir)/openmpi: $(tdir)/openmpi-$(openmpi-version).tar.gz +$(ibidir)/openmpi: $(tdir)/openmpi-$(openmpi-version).tar.gz \ + | $(ibidir)/openssh $(call gbuild, $<, openmpi-$(openmpi-version), static, , \ -j$(numthreads) V=1) \ && echo "Open MPI $(openmpi-version)" > $@ +$(ibidir)/openssh: $(tdir)/openssh-$(openssh-version).tar.gz + $(call gbuild, $<, openssh-$(openssh-version), static, \ + --with-ssl-engine \ + --with-privsep-user=nobody \ + --with-md5-passwords \ + , -j$(numthreads) V=1) \ + && echo "OpenSSH $(openssh-version)" > $@ + $(ibidir)/pixman: $(tdir)/pixman-$(pixman-version).tar.gz $(call gbuild, $<, pixman-$(pixman-version), static, , \ -j$(numthreads) V=1) \ -- cgit v1.2.1