aboutsummaryrefslogtreecommitdiff
path: root/reproduce
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2018-11-19 11:58:53 +0000
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2018-11-19 12:27:38 +0000
commit5ae1fdc475d4476c6371fc5b27880634782549d9 (patch)
treed2ab279fdba416e65b6d44b4dad0225ab1ebec63 /reproduce
parentfc7fd31a178a6094a3289c1e49ea7e7ac409e452 (diff)
Gzip's tarball in tar.gz instead of tar.lz
Until now, we were using a customized `tar.lz' tarball for Gzip. But on systems that don't have GNU Tar, this will cause a problem (non-GNU Tar doesn't recognize `.tar.lz'). So to keep things simple, we are using the customized gzip in `tar.gz' format. After the internal build of GNU Tar and Lzip, the default method of unpacking (`tar xf XXXXX.tar.XX') will work nicely on all the standard compression algorithms and we don't have to modify our commands based on the algorithm (nice feature of GNU Tar).
Diffstat (limited to 'reproduce')
-rw-r--r--reproduce/src/make/dependencies-basic.mk54
1 files changed, 27 insertions, 27 deletions
diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk
index dcc0b59..0372d7d 100644
--- a/reproduce/src/make/dependencies-basic.mk
+++ b/reproduce/src/make/dependencies-basic.mk
@@ -88,7 +88,7 @@ all: $(foreach p, $(top-level-programs), $(ibdir)/$(p))
tarballs = $(foreach t, bash-$(bash-version).tar.gz \
binutils-$(binutils-version).tar.lz \
bzip2-$(bzip2-version).tar.gz \
- gzip-$(gzip-version).tar.lz \
+ gzip-$(gzip-version).tar.gz \
lzip-$(lzip-version).tar.gz \
make-$(make-version).tar.lz \
tar-$(tar-version).tar.gz \
@@ -133,10 +133,17 @@ $(tarballs): $(tdir)/%:
+# GNU Gzip.
+$(ibdir)/gzip: $(tdir)/gzip-$(gzip-version).tar.gz
+ $(call gbuild,$(subst $(tdir)/,,$<), gzip-$(gzip-version), static)
+
+
+
+
+
# GNU Lzip: For a static build, the `-static' flag should be given to
# LDFLAGS on the command-line (not from the environment).
$(ibdir)/lzip: $(tdir)/lzip-$(lzip-version).tar.gz
- echo; echo $(static_build); echo;
ifeq ($(static_build),yes)
$(call gbuild,$(subst $(tdir)/,,$<), lzip-$(lzip-version), , \
LDFLAGS="-static")
@@ -148,15 +155,6 @@ endif
-# GNU Gzip.
-$(ibdir)/gzip: $(tdir)/gzip-$(gzip-version).tar.lz \
- $(ibdir)/lzip
- $(call gbuild,$(subst $(tdir)/,,$<), gzip-$(gzip-version), static)
-
-
-
-
-
# Zlib: its `./configure' doesn't use Autoconf's configure script, it just
# accepts a direct `--static' option.
$(ildir)/libz.a: $(tdir)/zlib-$(zlib-version).tar.gz
@@ -195,33 +193,34 @@ $(ibdir)/bzip2: $(tdir)/bzip2-$(bzip2-version).tar.gz
-# GNU Binutils:
-$(ibdir)/nm: $(tdir)/binutils-$(binutils-version).tar.lz \
- $(ibdir)/lzip \
- $(ildir)/libz.a
- $(call gbuild,$(subst $(tdir)/,,$<), binutils-$(binutils-version), \
- static)
-
-
-
-
-
# GNU Tar: When built statically, tar gives a segmentation fault on
# unpacking Bash. So we'll build it dynamically.
$(ibdir)/tar: $(tdir)/tar-$(tar-version).tar.gz \
$(ibdir)/bzip2 \
- $(ibdir)/gzip \
$(ibdir)/lzip \
- $(ibdir)/xz \
- $(ibdir)/nm
+ $(ibdir)/gzip \
+ $(ibdir)/xz
$(call gbuild,$(subst $(tdir)/,,$<), tar-$(tar-version))
+# GNU Binutils:
+$(ibdir)/nm: $(tdir)/binutils-$(binutils-version).tar.lz \
+ $(ibdir)/tar \
+ $(ildir)/libz.a
+ $(call gbuild,$(subst $(tdir)/,,$<), binutils-$(binutils-version), \
+ static)
+
+
+
+
+
# GNU Which:
-$(ibdir)/which: $(tdir)/which-$(which-version).tar.gz
+$(ibdir)/which: $(tdir)/which-$(which-version).tar.gz \
+ $(ibdir)/tar \
+ $(ibdir)/nm
$(call gbuild,$(subst $(tdir)/,,$<), which-$(which-version), static)
@@ -234,7 +233,8 @@ $(ibdir)/which: $(tdir)/which-$(which-version).tar.gz
# `--disable-load', but unfortunately I don't know any way to fix the
# second. So, we'll have to build it dynamically for now.
$(ibdir)/make: $(tdir)/make-$(make-version).tar.lz \
- $(ibdir)/tar
+ $(ibdir)/tar \
+ $(ibdir)/nm
$(call gbuild,$(subst $(tdir)/,,$<), make-$(make-version))