From 393bc1e84addf5c17b056a86c27356eb8d2ea7d9 Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Mon, 12 Nov 2018 20:28:21 +0000 Subject: Libcurl, Git, CMake, TIFF, Zlib also built at configure time During the configuration step several new programs that were necessary for a more complete controlled environment are now also downloaded and built statically. --- reproduce/config/pipeline/LOCAL.mk.in | 39 ++++++++++++------------ reproduce/config/pipeline/dependency-versions.mk | 7 ++++- 2 files changed, 26 insertions(+), 20 deletions(-) (limited to 'reproduce/config') diff --git a/reproduce/config/pipeline/LOCAL.mk.in b/reproduce/config/pipeline/LOCAL.mk.in index 02f8b11..b74d9f6 100644 --- a/reproduce/config/pipeline/LOCAL.mk.in +++ b/reproduce/config/pipeline/LOCAL.mk.in @@ -22,21 +22,6 @@ -# (OPTIONAL) Dependencies directory -# --------------------------------- -# -# To ensure an identical build environment, the pipeline will use its own -# build of the programs it needs. Therefore the tarball of the relevant -# programs are necessary for this pipeline. If a tarball isn't present in -# the specified directory, it will be downloaded by the pipeline. Therefore -# an internet connection will be mandatory. -# -# Important note: Keep atleast one blank space before and after `='. -DEPENDENCIES-DIR = /optional/path/to/directory/containing/tarballs - - - - # Build directory # --------------- # @@ -55,8 +40,24 @@ BDIR = /path/of/directory/for/building -# Memory mapping minimum size -# --------------------------- +# (OPTIONAL) Dependencies directory +# --------------------------------- +# +# To ensure an identical build environment, the pipeline will use its own +# build of the programs it needs. Therefore the tarball of the relevant +# programs are necessary for this pipeline. If a tarball isn't present in +# the specified directory, it will be downloaded by the pipeline. Therefore +# an internet connection will be mandatory. +# +# Important note: Keep atleast one blank space before and after `='. +DEPENDENCIES-DIR = /optional/path/to/directory/containing/tarballs + + + + + +# (OPTIONAL) Memory mapping minimum size +# -------------------------------------- # # Some programs (for example Gnuastro) can deal with cases where the local # system doesn't have enough memory (RAM) to keep large files there. For @@ -75,8 +76,8 @@ MINMAPSIZE = 1000000000 -# Downloader program -# ------------------ +# (OPTIONAL) Downloader program +# ----------------------------- # # The downloder program (and its output option name, for example `wget -O' # or `curl -o') that will be used if any of the necessary datasets aren't diff --git a/reproduce/config/pipeline/dependency-versions.mk b/reproduce/config/pipeline/dependency-versions.mk index 3d9d8b3..dac56b1 100644 --- a/reproduce/config/pipeline/dependency-versions.mk +++ b/reproduce/config/pipeline/dependency-versions.mk @@ -1,15 +1,20 @@ # Versions of the various dependnecies bash-version = 4.4.18 cfitsio-version = 3450 +cmake-version = 3.12.4 coreutils-version = 8.30 +curl-version = 7.62.0 gawk-version = 4.2.1 ghostscript-version = 9.25 -gnuastro-version = 0.7.58-e72a +git-version = 2.19.1 +gnuastro-version = 0.7.60-4c9eb grep-version = 3.1 gsl-version = 2.5 libjpeg-version = v9b libgit2-version = 0.26.0 +libtiff-version = 4.0.10 libtool-version = 2.4.6 make-version = 4.2.90 sed-version = 4.5 wcslib-version = 6.2 +zlib-version = 1.2.11 -- cgit v1.2.1