From 86d93b56c05609565a1a4566de37ae0283896bd7 Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Wed, 1 May 2019 00:50:37 +0100 Subject: 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. --- reproduce/software/make/build-rules.mk | 7 +++++-- reproduce/software/make/high-level.mk | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/reproduce/software/make/build-rules.mk b/reproduce/software/make/build-rules.mk index f888df7..b82ccc0 100644 --- a/reproduce/software/make/build-rules.mk +++ b/reproduce/software/make/build-rules.mk @@ -110,7 +110,10 @@ cbuild = if [ x$(static_build) = xyes ] && [ $(3)x = staticx ]; then \ export LDFLAGS="$$LDFLAGS -static"; \ opts="-DBUILD_SHARED_LIBS=OFF"; \ fi; \ - cd $(ddir) && rm -rf $(2) && tar xf $(1) && cd $(2) \ + cd $(ddir) \ + && rm -rf $(2) \ + && tar xf $(1) \ + && cd $(2) \ && rm -rf project-build \ && mkdir project-build \ && cd project-build \ @@ -119,4 +122,4 @@ cbuild = if [ x$(static_build) = xyes ] && [ $(3)x = staticx ]; then \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON $$opts $(4) \ && make && make install \ && cd ../.. \ - rm -rf $(2) + && rm -rf $(2) 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 -- cgit v1.2.1