From 5227aefe97df913ed62ef4285f55a7d54f30ae78 Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Mon, 31 Dec 2018 16:07:42 +0000 Subject: Updated Gzip and Gnuastro versions to standard builds Both Gzip and Gnuastro were being bootstrapped personally from their Git repository until now. But fortunately a new release of both came out last week and so to make things standard we are now using their standard tarballs. I also noticed that we weren't checking the version of Gzip or mentioning it in the acknowledgement section. This was also corrected. --- reproduce/config/pipeline/dependency-versions.mk | 4 ++-- reproduce/src/make/dependencies-basic.mk | 2 +- reproduce/src/make/dependencies.mk | 2 +- reproduce/src/make/initialize.mk | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'reproduce') diff --git a/reproduce/config/pipeline/dependency-versions.mk b/reproduce/config/pipeline/dependency-versions.mk index 79c6639..3dec7e0 100644 --- a/reproduce/config/pipeline/dependency-versions.mk +++ b/reproduce/config/pipeline/dependency-versions.mk @@ -14,9 +14,9 @@ gcc-version = 8.2.0 ghostscript-version = 9.26 git-version = 2.20.0 gmp-version = 6.1.2 -gnuastro-version = 0.7.71-efe6f +gnuastro-version = 0.8 grep-version = 3.1 -gzip-version = 1.9.10-051e +gzip-version = 1.10 isl-version = 0.18 libtool-version = 2.4.6 lzip-version = 1.20 diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk index 8717656..5e58b00 100644 --- a/reproduce/src/make/dependencies-basic.mk +++ b/reproduce/src/make/dependencies-basic.mk @@ -139,7 +139,7 @@ $(tarballs): $(tdir)/%: elif [ $$n = gcc ]; then w=http://ftpmirror.gnu.org/gcc/gcc-$(gcc-version); \ elif [ $$n = gmp ]; then w=https://gmplib.org/download/gmp; \ elif [ $$n = grep ]; then w=http://ftpmirror.gnu.org/gnu/grep; \ - elif [ $$n = gzip ]; then w=http://akhlaghi.org/src; \ + elif [ $$n = gzip ]; then w=http://ftpmirror.gnu.org/gnu/gzip; \ elif [ $$n = isl ]; then w=ftp://gcc.gnu.org/pub/gcc/infrastructure; \ elif [ $$n = lzip ]; then w=http://download.savannah.gnu.org/releases/lzip; \ elif [ $$n = make ]; then w=http://akhlaghi.org/src; \ diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk index 6a8e18e..da5843f 100644 --- a/reproduce/src/make/dependencies.mk +++ b/reproduce/src/make/dependencies.mk @@ -126,7 +126,7 @@ $(tarballs): $(tdir)/%: elif [ $$n = flock ]; then w=https://github.com/discoteq/flock/releases/download/v$(flock-version) elif [ $$n = ghostscript ]; then w=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs926 elif [ $$n = git ]; then w=http://mirrors.edge.kernel.org/pub/software/scm/git - elif [ $$n = gnuastro ]; then w=http://akhlaghi.org/src + elif [ $$n = gnuastro ]; then w=http://ftpmirror.gnu.org/gnu/gnuastro elif [ $$n = gsl ]; then w=http://ftpmirror.gnu.org/gnu/gsl elif [ $$n = install ]; then w=http://mirror.ctan.org/systems/texlive/tlnet elif [ $$n = jpegsrc ]; then w=http://ijg.org/files diff --git a/reproduce/src/make/initialize.mk b/reproduce/src/make/initialize.mk index 4f96c5d..fb84a17 100644 --- a/reproduce/src/make/initialize.mk +++ b/reproduce/src/make/initialize.mk @@ -206,6 +206,7 @@ $(mtexdir)/initialize.tex: | $(mtexdir) $(call pvcheck, grep, $(grep-version), GNU Grep, grepversion) $(call pvcheck, glibtool, $(libtool-version), GNU Libtool, \ libtoolversion) + $(call pvcheck, gzip, $(gzip-version), GNU Gzip, gzipversion) $(call pvcheck, ls, $(coreutils-version), GNU Coreutils, \ coreutilsversion) $(call pvcheck, lzip, $(lzip-version), Lzip, lzipversion) -- cgit v1.2.1