diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-10-01 20:05:51 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-10-01 20:05:51 +0100 |
| commit | 8bbe54dd3db007752cd1145caaaa9fe7d7084762 (patch) | |
| tree | 9b1a993bc22647e7451de8ebb02318dce478c056 | |
| parent | 4230cefd85348f297224596fd9db927793fcb39b (diff) | |
Minor corrections in configure and prepare phase
Since ImageMagick can take long to build, we are now building it in
parallel. Also, the part where we replace an `_' with `\_' in the software
version at the end of the configure script was removed. It is more
clear/readable that the actual rule that includes such a name deals with
the underline (as is the case for `sip_tpv' which already dealt with it).
Finally, I noticed that the checks at the start of `top-prepare' were
missing new-lines. I had forgot that the Make single-shell variable isn't
activated in this stage yet.
| -rw-r--r-- | .file-metadata | bin | 6573 -> 6413 bytes | |||
| -rw-r--r-- | reproduce/analysis/make/top-prepare.mk | 20 | ||||
| -rwxr-xr-x | reproduce/software/bash/configure.sh | 1 | ||||
| -rw-r--r-- | reproduce/software/make/high-level.mk | 2 |
4 files changed, 11 insertions, 12 deletions
diff --git a/.file-metadata b/.file-metadata Binary files differindex e787ed4..15f8b13 100644 --- a/.file-metadata +++ b/.file-metadata diff --git a/reproduce/analysis/make/top-prepare.mk b/reproduce/analysis/make/top-prepare.mk index e03e890..473911c 100644 --- a/reproduce/analysis/make/top-prepare.mk +++ b/reproduce/analysis/make/top-prepare.mk @@ -44,20 +44,20 @@ all: $(BDIR)/software/preparation-done.mk echo "Please run the following command to start building the project." echo "(Replace '8' with the number of CPU threads on your system)" echo "" - if [ "x$(GROUP-NAME)" = x ]; then - echo " $$ ./project make" - else - echo " $$ ./project make --group=$(GROUP-NAME) -j8" + if [ "x$(GROUP-NAME)" = x ]; then \ + echo " $$ ./project make"; \ + else \ + echo " $$ ./project make --group=$(GROUP-NAME) -j8"; \ fi echo "" else all: - @if [ "x$(GROUP-NAME)" = x ]; then - echo "Project is NOT configured for groups, please run" - echo " $$ ./project prepare" - else - echo "Project is configured for groups, please run" - echo " $$ ./project prepare --group=$(GROUP-NAME) -j8" + @if [ "x$(GROUP-NAME)" = x ]; then \ + echo "Project is NOT configured for groups, please run"; \ + echo " $$ ./project prepare"; \ + else \ + echo "Project is configured for groups, please run"; \ + echo " $$ ./project prepare --group=$(GROUP-NAME) -j8"; \ fi endif diff --git a/reproduce/software/bash/configure.sh b/reproduce/software/bash/configure.sh index 7ef576a..535fcc4 100755 --- a/reproduce/software/bash/configure.sh +++ b/reproduce/software/bash/configure.sh @@ -1302,7 +1302,6 @@ function prepare_name_version() { # Put them all in one paragraph. .local/bin/cat $@ \ | .local/bin/sort \ - | sed 's/_/\\_/' \ | .local/bin/awk 'NF>0 { \ c++; \ if(c==1) \ diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 930bad8..3516330 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -713,7 +713,7 @@ $(ibidir)/imagemagick: $(tdir)/imagemagick-$(imagemagick-version).tar.xz \ $(ibidir)/libtiff \ $(ibidir)/zlib $(call gbuild, $<, ImageMagick-$(imagemagick-version), static, \ - --without-x --disable-openmp, V=1) \ + --without-x --disable-openmp, V=1 -j$(numthreads)) \ && echo "ImageMagick $(imagemagick-version)" > $@ # `imfit' doesn't use the traditional `configure' and `make' to install |