diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-05-01 00:50:37 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-05-01 00:57:16 +0100 |
| commit | 86d93b56c05609565a1a4566de37ae0283896bd7 (patch) | |
| tree | b717d26364ca3bab4f1027d1371204a7579238c0 /reproduce/software/make/high-level.mk | |
| parent | 3d397c21ca2da53784fed8d6a107514b2565f55d (diff) | |
Problem in generic CMake rule corrected
In the recent correction of backslashes, I had missed adding an `&&' before
the `rm' command of the generic CMake building rule (`cbuild' of
`build-rules.mk'). With this commit, this has been corrected.
A multi-threaded Make was also added to build OpenMPI (which takes long and
is often built alone because it takes so long and other things depend on
it) and the HDF5 library.
Diffstat (limited to 'reproduce/software/make/high-level.mk')
| -rw-r--r-- | reproduce/software/make/high-level.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 3225e41..866d5d2 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -294,7 +294,7 @@ $(ibidir)/hdf5: $(tdir)/hdf5-$(hdf5-version).tar.gz \ export FC=mpif90; \ $(call gbuild, $<, hdf5-$(hdf5-version), static, \ --enable-parallel \ - --enable-fortran, V=1) \ + --enable-fortran, -j$(numthreads) V=1) \ && echo "HDF5 library $(hdf5-version)" > $@ $(ibidir)/libjpeg: $(tdir)/jpegsrc.$(libjpeg-version).tar.gz @@ -327,7 +327,8 @@ $(ibidir)/libtiff: $(tdir)/tiff-$(libtiff-version).tar.gz \ && echo "Libtiff $(libtiff-version)" > $@ $(ibidir)/openmpi: $(tdir)/openmpi-$(openmpi-version).tar.gz - $(call gbuild, $<, openmpi-$(openmpi-version), static, , V=1) \ + $(call gbuild, $<, openmpi-$(openmpi-version), static, , \ + -j$(numthreads) V=1) \ && echo "Open MPI $(openmpi-version)" > $@ $(ibidir)/atlas: $(tdir)/atlas-$(atlas-version).tar.bz2 \ @@ -451,7 +452,7 @@ $(ibidir)/libgit2: $(tdir)/libgit2-$(libgit2-version).tar.gz \ -DUSE_SSH=OFF -DBUILD_CLAR=OFF \ -DTHREADSAFE=ON ) - # Correct the shared library absolute address if necessary. + # Correct the shared library absolute address on Mac systems. if [ x$(on_mac_os) = xyes ]; then install_name_tool -id $(ildir)/libgit2.26.dylib \ $(ildir)/libgit2.26.dylib |