diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-07-15 01:16:31 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-07-15 01:16:31 +0100 |
| commit | 9901c3b2db0a3f85105489faa860fc27227ad4ac (patch) | |
| tree | cc14f042f113c4356042e3d0fcefabf46bfd6617 | |
| parent | e83270cc0c9c17951669874bcfb5284301272ede (diff) | |
Minor corrections in configure and high-level
Configure script: when `texlive-ready-tlmgr' is not created, it is similar
to not having installed TeXLive. A check was added so in this scenario the
`./configure' script doesn't crash.
high-level.mk: `cairo' and `pixman' are now installed in parallel and with
`V=1' (so the full compilation and linking command is printed).
| -rw-r--r-- | .file-metadata | bin | 6106 -> 6179 bytes | |||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | reproduce/software/make/high-level.mk | 9 |
3 files changed, 10 insertions, 5 deletions
diff --git a/.file-metadata b/.file-metadata Binary files differindex 587ad74..c5db26b 100644 --- a/.file-metadata +++ b/.file-metadata @@ -1157,7 +1157,11 @@ fi # will just stop at the stage when all the processing is complete and it is # only necessary to build the PDF. So we don't want to stop the project's # configuration and building if its not present. -texlive_result=$(cat $itidir/texlive-ready-tlmgr) +if [ -f $itidir/texlive-ready-tlmgr ]; then + texlive_result=$(cat $itidir/texlive-ready-tlmgr) +else + texlive_result="NOT!" +fi if [ x"$texlive_result" = x"NOT!" ]; then cat <<EOF diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index b350c57..05e9433 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -68,8 +68,8 @@ all: $(foreach p, $(top-level-programs), $(ibidir)/$(p)) \ .SHELLFLAGS := --noprofile --norc -ec export CCACHE_DISABLE := 1 export PATH := $(ibdir) -export CC := $(ibdir)/gcc export CXX := $(ibdir)/g++ +export CC := $(ibdir)/gcc export SHELL := $(ibdir)/bash export F77 := $(ibdir)/gfortran export PKG_CONFIG_PATH := $(ildir)/pkgconfig @@ -101,7 +101,7 @@ downloadwrapper = ./reproduce/analysis/bash/download-multi-try -# Python packages +# Mini-environment software include reproduce/software/make/python.mk @@ -370,7 +370,7 @@ $(ibidir)/cairo: $(tdir)/cairo-$(cairo-version).tar.xz \ $(ibidir)/libpng \ $(ibidir)/pixman $(call gbuild, $<, cairo-$(cairo-version), static, \ - --with-x=no) \ + --with-x=no, -j$(numthreads) V=1) \ && echo "Cairo $(cairo-version)" > $@ $(ibidir)/fftw: $(tdir)/fftw-$(fftw-version).tar.gz @@ -449,7 +449,8 @@ $(ibidir)/openmpi: $(tdir)/openmpi-$(openmpi-version).tar.gz && echo "Open MPI $(openmpi-version)" > $@ $(ibidir)/pixman: $(tdir)/pixman-$(pixman-version).tar.gz - $(call gbuild, $<, pixman-$(pixman-version), static) \ + $(call gbuild, $<, pixman-$(pixman-version), static, , \ + -j$(numthreads) V=1) \ && echo "Pixman $(pixman-version)" > $@ $(ibidir)/tides: $(tdir)/tides-$(tides-version).tar.gz |