aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaul Infante-Sainz <infantesainz@gmail.com>2019-04-12 14:57:12 +0100
committerRaul Infante-Sainz <infantesainz@gmail.com>2019-04-12 14:57:12 +0100
commit1442a5ebe5f9ca66f25c0f0a585c6ac4083101d8 (patch)
treeb25c8d256bafe8c9b099b0751a3d965d6bb9853d
parentf4b0b28c3ccfe9dc49b529773eee75627253689d (diff)
File is built as a dependency of GCC
Until now, we did not have `file'. It was in other project, where a problem with `Astrometry-net' software, ends up with the necessity of having `file' into the pipeline. With this commit, we add `file' to the project. Since it is a low level program, it is set in `dependencies-basic.mk' as a prerequisite of GCC.
-rw-r--r--.file-metadatabin4780 -> 4780 bytes
-rw-r--r--reproduce/config/pipeline/dependency-versions.mk1
-rw-r--r--reproduce/src/make/dependencies-basic.mk13
3 files changed, 12 insertions, 2 deletions
diff --git a/.file-metadata b/.file-metadata
index 4d9046a..0607790 100644
--- a/.file-metadata
+++ b/.file-metadata
Binary files differ
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 \