aboutsummaryrefslogtreecommitdiff
path: root/reproduce/software/make
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2019-08-06 19:13:28 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2019-08-06 19:13:28 +0100
commitf9fa4fd518d0f49b3176603c4c6ccabf78fd2bcf (patch)
tree12ebcfc42b3481c8419cb394cce79890f585d0c0 /reproduce/software/make
parent29540c2ba572ee46e9907c4b66153ce02b39c701 (diff)
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.
Diffstat (limited to 'reproduce/software/make')
-rw-r--r--reproduce/software/make/high-level.mk15
1 files changed, 13 insertions, 2 deletions
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) \