aboutsummaryrefslogtreecommitdiff
path: root/reproduce
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2019-04-12 15:51:26 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2019-04-12 15:51:26 +0100
commit41c444a1a0fcff2aaa5c9b0dd2fc1e6b3aaf6de1 (patch)
treef18889a878d752562246218c0f8e89a61fdedf2b /reproduce
parentb177c7e99cdf605fd826d4f0f2026251e42ce164 (diff)
parent1442a5ebe5f9ca66f25c0f0a585c6ac4083101d8 (diff)
Imported recent corrections, no conflicts
Some recent corrections that were done by Raul are now merged into the pipeline. There weren't any conflicts.
Diffstat (limited to 'reproduce')
-rw-r--r--reproduce/config/pipeline/dependency-versions.mk1
-rw-r--r--reproduce/src/make/dependencies-basic.mk13
-rw-r--r--reproduce/src/make/dependencies-python.mk29
3 files changed, 28 insertions, 15 deletions
diff --git a/reproduce/config/pipeline/dependency-versions.mk b/reproduce/config/pipeline/dependency-versions.mk
index 3b43aae..91d1265 100644
--- a/reproduce/config/pipeline/dependency-versions.mk
+++ b/reproduce/config/pipeline/dependency-versions.mk
@@ -29,6 +29,7 @@ coreutils-version = 8.30
curl-version = 7.63.0
diffutils-version = 3.7
fftw-version = 3.3.8
+file-version = 5.36
findutils-version = 4.6.0.199-e3fc
flock-version = 0.2.3
freetype-version = 2.9
diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk
index bedbc38..9e277f7 100644
--- a/reproduce/src/make/dependencies-basic.mk
+++ b/reproduce/src/make/dependencies-basic.mk
@@ -67,7 +67,7 @@ export CPPFLAGS := -I$(idir)/include $(CPPFLAGS)
export LD_LIBRARY_PATH := $(ildir):$(LD_LIBRARY_PATH)
# Define the programs that don't depend on any other.
-top-level-programs = low-level-links wget gcc
+top-level-programs = low-level-links wget gcc file
all: $(foreach p, $(top-level-programs), $(ibidir)/$(p))
@@ -104,6 +104,7 @@ tarballs = $(foreach t, bash-$(bash-version).tar.gz \
cert.pem \
coreutils-$(coreutils-version).tar.xz \
diffutils-$(diffutils-version).tar.xz \
+ file-$(file-version).tar.gz \
findutils-$(findutils-version).tar.lz \
gawk-$(gawk-version).tar.lz \
gcc-$(gcc-version).tar.xz \
@@ -144,6 +145,7 @@ $(tarballs): $(tdir)/%: | $(lockdir)
elif [ $$n = cert ]; then w=http://akhlaghi.org/src; \
elif [ $$n = coreutils ]; then w=http://ftp.gnu.org/gnu/coreutils;\
elif [ $$n = diffutils ]; then w=http://ftp.gnu.org/gnu/diffutils;\
+ elif [ $$n = file ]; then w=ftp://ftp.astron.com/pub/file; \
elif [ $$n = findutils ]; then w=http://akhlaghi.org/src; \
elif [ $$n = gawk ]; then w=http://ftp.gnu.org/gnu/gawk; \
elif [ $$n = gcc ]; then w=http://ftp.gnu.org/gnu/gcc/gcc-$(gcc-version); \
@@ -769,6 +771,12 @@ $(ibidir)/binutils: $(tdir)/binutils-$(binutils-version).tar.lz
$(call gbuild, $<, binutils-$(binutils-version), static) \
&& echo "GNU Binutils $(binutils-version)" > $@
+# `file' is not a prerequisite of GCC. However, since it is low level, it is
+# set as a prerequisite of GCC to have it installed.
+$(ibidir)/file: $(tdir)/file-$(file-version).tar.gz
+ $(call gbuild, $<, file-$(file-version), static) \
+ && echo "File $(file-version)" > $@
+
$(ilidir)/isl: $(tdir)/isl-$(isl-version).tar.bz2 \
$(ilidir)/gmp
$(call gbuild, $<, isl-$(isl-version), static) \
@@ -801,9 +809,10 @@ gcc-prerequisites = $(tdir)/gcc-$(gcc-version).tar.xz \
endif
$(ibidir)/gcc: $(gcc-prerequisites) \
$(ibidir)/sed \
+ $(ibidir)/bash \
+ $(ibidir)/file \
$(ibidir)/gawk \
$(ibidir)/grep \
- $(ibidir)/bash \
$(ibidir)/which \
$(ibidir)/glibtool \
$(ibidir)/findutils \
diff --git a/reproduce/src/make/dependencies-python.mk b/reproduce/src/make/dependencies-python.mk
index 5b12757..11c6b1f 100644
--- a/reproduce/src/make/dependencies-python.mk
+++ b/reproduce/src/make/dependencies-python.mk
@@ -254,7 +254,7 @@ $(ibidir)/python3: $(tdir)/python-$(python-version).tar.gz \
# 3) Unpacked directory name after unpacking the tarball
# 4) site.cfg file (optional)
# 5) Official software name.(for paper).
-pybuild = cd $(ddir); rm -rf $(3); \
+pybuild = cd $(ddir); rm -rf $(3); \
if ! $(1) $(2); then echo; echo "Tar error"; exit 1; fi; \
cd $(3); \
if [ "x$(strip $(4))" != x ]; then \
@@ -335,8 +335,8 @@ $(ipydir)/cycler: $(tdir)/cycler-$(cycler-version).tar.gz \
$(ipydir)/cython: $(tdir)/cython-$(cython-version).tar.gz \
$(ipydir)/setuptools
- $(call pybuild, tar xf, $<, Cython-$(cython-version), ,\
- Cython $(cython-version))
+ $(call pybuild, tar xf, $<, Cython-$(cython-version)) \
+ && echo "Cython $(cython-version) \citep{cython2011}" > $@
$(ipydir)/entrypoints: $(tdir)/entrypoints-$(entrypoints-version).tar.gz \
$(ipydir)/setuptools
@@ -389,8 +389,8 @@ $(ipydir)/matplotlib: $(tdir)/matplotlib-$(matplotlib-version).tar.gz \
$(ipydir)/numpy \
$(ipydir)/pyparsing \
$(ipydir)/python-dateutil
- $(call pybuild, tar xf, $<, matplotlib-$(matplotlib-version), ,\
- Matplotlib $(matplotlib-version))
+ $(call pybuild, tar xf, $<, matplotlib-$(matplotlib-version)) \
+ && echo "Matplotlib $(matplotlib-version) \citep{matplotlib2007}" > $@
# Currently mpi4py doesn't build because of some conflict with OpenMPI:
#
@@ -404,21 +404,23 @@ $(ipydir)/matplotlib: $(tdir)/matplotlib-$(matplotlib-version).tar.gz \
$(ipydir)/mpi4py: $(tdir)/mpi4py-$(mpi4py-version).tar.gz \
$(ipydir)/setuptools \
$(ilidir)/openmpi
- $(call pybuild, tar xf, $<, mpi4py-$(mpi4py-version), ,\
- mpi4py $(mpi4py-version))
+ $(call pybuild, tar xf, $<, mpi4py-$(mpi4py-version)) \
+ && echo "mpi4py $(mpi4py-version) \citep{mpi4py2011}" > $@
$(ipydir)/numpy: $(tdir)/numpy-$(numpy-version).zip \
$(ipydir)/setuptools \
$(ilidir)/openblas \
- $(ilidir)/fftw
+ $(ilidir)/fftw \
+ $(ibidir)/unzip
if [ x$(on_mac_os) = xyes ]; then \
export LDFLAGS="$(LDFLAGS) -undefined dynamic_lookup -bundle"; \
else \
export LDFLAGS="$(LDFLAGS) -shared"; \
fi; \
conf="$$(pwd)/reproduce/config/pipeline/dependency-numpy-scipy.cfg"; \
- $(call pybuild, unzip, $<, numpy-$(numpy-version),$$conf, \
- Numpy $(numpy-version))
+ $(call pybuild, unzip, $<, numpy-$(numpy-version),$$conf, \
+ Numpy $(numpy-version)) \
+ && echo "Numpy $(numpy-version) \citep{numpy2011}" > $@
$(ibidir)/pip3: $(tdir)/pip-$(pip-version).tar.gz \
$(ipydir)/setuptools
@@ -463,8 +465,8 @@ $(ipydir)/scipy: $(tdir)/scipy-$(scipy-version).tar.gz \
export LDFLAGS="$(LDFLAGS) -shared"; \
fi; \
conf="$$(pwd)/reproduce/config/pipeline/dependency-numpy-scipy.cfg"; \
- $(call pybuild, tar xf, $<, scipy-$(scipy-version),$$conf,\
- Scipy $(scipy-version))
+ $(call pybuild, tar xf, $<, scipy-$(scipy-version),$$conf)       \
+ && echo "Scipy $(scipy-version) \citep{scipy2007,scipy2011}" > $@
$(ipydir)/secretstorage: $(tdir)/secretstorage-$(secretstorage-version).tar.gz \
$(ipydir)/cryptography \
@@ -473,7 +475,8 @@ $(ipydir)/secretstorage: $(tdir)/secretstorage-$(secretstorage-version).tar.gz \
SecretStorage $(secretstorage-version))
$(ipydir)/setuptools: $(tdir)/setuptools-$(setuptools-version).zip \
- $(ibidir)/python3
+ $(ibidir)/python3 \
+ $(ibidir)/unzip
$(call pybuild, unzip, $<, setuptools-$(setuptools-version), ,\
Setuptools $(setuptools-version))