From fd9660a8a8ba51632303dae8e3a3c6eef7b23a64 Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Fri, 6 Sep 2019 18:45:43 +0100
Subject: Updated versions of several software
New versions of astropy, bash, cmake, curl, findutils, gawk, gcc,
ghostscript, git, make, gsl had recently come so they are updated with this
commit.
About GNU Findutils and GNU Make: I was bootstrapping (building the tarball
of) these two separately separately because their standard tarball release
had problems on some systems. Both have been updated now so I am no longer
using my own webpage as their main URL.
A special note about GNU Make. I just noticed that during bootstrapping,
GNU Make would use the fixed version string of `4.2.90' for any commit!!!
But fortunately they have officially released their 4.2.90 version, so we
are safely using their own webpage. The only difference is the compression
format. My old bootstrapped build was `tar.lz', but the standard release is
`tar.gz'.
Also, all the basic programs (installed in `.local/bin') in `basic.mk' are
now existance-only dependencies (after a `|'). Because later programs just
use them at a very basic level, so there is no need to rebuild everything
when Bash gets updated for example.
---
.../software/config/installation/checksums.mk | 22 +++----
reproduce/software/config/installation/versions.mk | 20 +++---
reproduce/software/make/basic.mk | 71 +++++++++++-----------
reproduce/software/make/high-level.mk | 5 +-
reproduce/software/make/python.mk | 2 +-
5 files changed, 61 insertions(+), 59 deletions(-)
(limited to 'reproduce')
diff --git a/reproduce/software/config/installation/checksums.mk b/reproduce/software/config/installation/checksums.mk
index 17633b0..3344a2b 100644
--- a/reproduce/software/config/installation/checksums.mk
+++ b/reproduce/software/config/installation/checksums.mk
@@ -21,19 +21,19 @@
# Basic/low-level programs and libraires (installed in any case)
# --------------------------------------------------------------
-bash-checksum = 2c026e479e77bf24309350b57ec7a7755dd4199ce0c34e333efc66ecaf6b82aac8badf5dd407f4a8af00830e084ba4be333ae708476494ef2150f3ba6871d54d
+bash-checksum = a93f221fe800908e335584837f63d02a350d9c8b2711f1923e946980b960fb2d4a21e4321f722c70e5faf5554991a6b9ef6722d214a1921f71030896cf134639
binutils-checksum = a5e1f77e985d7d66e3ec6ed62a51a61c82ed0964a5108a1f318bf717f3f2af4dcd018ec3a66c10d6dc7525bad801b118f468eca07b2502c836895f4091bbeed4
bzip2-checksum = 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
cert-checksum = a81dfa59c70788126a395c576e54cb8f61c1ea34da69b5cd42e2d83ee6426c2a26941360c7302793774ea98ca16846deb6e683144cc7fb6da6ef87b70447e4c8
coreutils-checksum = ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af
-curl-checksum = 0a4b81d115f579df8301859f7d06d00bd9820cbf2fb6b63c6a49418aa174ab32bcbc8942f032f2ea924d208f147de8a30f02f6b922f627d3d9d4afc60df8a39f
+curl-checksum = df8fc6b2cccf100f7479e25cad743964a84066b587da19585b36a788b0041925e33944986d636a451d6bb95a452d5ac6812b2d5fa6631a10e0ac82a2c7821c75
diffutils-checksum = 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
file-checksum = 3ec5e51ffb7a82defa74845a90fbc983f6e169fc116606049bc01ff6e720d340c8abf6eb7a08b9ac1099162a5c02deac3633b07b039d486344c8abd9052ca751
-findutils-checksum = 74bc6b1b9bb5b994e6de5bff83bf15fc4275203d0e7f9ba5ad563c3bc4e4804251a0fb7ddd4eb904ab2f6071b5f342f198f03aca753312e4711b3b32167ee32b
+findutils-checksum = 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
flock-checksum = 2fe663839b5fd03a08e8b3d0596ce1b4216d8f19a1c4da4fa3db8b409aa4aa292358cc671be857e0f308315458bb2e10288f9d2152dce9940085d33cb7e4a24b
-gawk-checksum = 47cf7b87ec175f50fcb27c38d6b628dd808bbd9523e0e5e1f9626567de945cb995560f18257145ac7ce2088dacbbcf9861d63ef372c8c5d02aac071af45e3335
-gcc-checksum = b6134df027e734cee5395afd739fcfa4ea319a6017d662e54e89df927dea19d3fff7a6e35d676685383034e3db01c9d0b653f63574c274eeb15a2cb0bc7a1f28
-git-checksum = 75b3dcac36f80281effcd099944de34050a35f3599ce42f86ce60455b6c952039fb0f6438d296e0cc9c0651d4a17f467780dc475669227d3c98ddefe91723d42
+gawk-checksum = 3734740b7406ddfec9e04bb7774e76c6446cba76642a6180266e7b1822de20aab824c29c4e417256d877762ef04ef3f9df855cd4a3ca414a9225323b49d79195
+gcc-checksum = a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
+git-checksum = c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671
gmp-checksum = 8aea94f867174eacac44f395ceb9212530c208e8de69d0bb53056f52360317230fc84ac177fd3ffc9fdb19a07c7549305dcc34c83c34821ccfab9dc63a16e67e
grep-checksum = e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db
gzip-checksum = 7939043e74554ced0c1c05d354ab4eb36cd6dce89ad79d02ccdc5ed6b7ee390759689b2d47c07227b9b44a62851afe7c76c4cae9f92527d999f3f1b4df1cccff
@@ -43,7 +43,7 @@ libiconv-checksum = 365dac0b34b4255a0066e8033a8b3db4bdb94b9b57a9dca17ebf2d779139
libtool-checksum = a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
lzip-checksum= 0349b4c6c0b41e601b7ee381c3254d741397beb3ef9354c08162f346f131f4f48f6613ee0a610cdc6d827530df634f884ecfeee35215b10045a40fee76f8e938
m4-checksum = a92cad4441b3fd7c033837389ca3499494523d364a5fda043d92c517051510f1758b3b837f0477f42d2258a179ab79a4993e5d1694ef2673db6d96d1faff84fe
-make-checksum = cd29b3ea426c80fa89f533a3e3832f597dbbd080b02b32901563c7b0622fd84a9a22ac1e29e02d97e7f9ccdd01e55bd33ecd236c15f9166c368bfb88984dd87b
+make-checksum = 6ebf886a394c61eea53dc0fa277b00cda263861e8e647608e0fce549cd619946981224408ee519bbd71068e9424798d3c5791451f60ff06d766f563142703d32
metastore-checksum = b2a5fdde9de5ddc1e6c368d5da1b2e97e4fdbaa138a7be281ccb40a81dd4a9bb1849d36b2d5d3f01205079bace60441f82a7002097ff3a7037340a35b0f1574a
mpc-checksum = 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628
mpfr-checksum = d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88
@@ -78,12 +78,12 @@ atlas-checksum = bf17306f09f2aa973cb776e2c9eacfb2409ad4d95d19802e1c4e0597d0a099f
cairo-checksum = 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
cdsclient-checksum = 2d7abf0079189b9dd19cb8919061445fd19ea9f7dfd54e8ceee26b743218cf62ab00eba0147abe82d9294223927f04b4cc3328620dfc9184a7049f8d515b29e4
cfitsio-checksum = c0502699e266928dd25abe57730dc4b357ccc9023789fe745324ae01aa688516aceaf37321ee578f0430111d9718f0fec0dc5b54c07f935529560f00b32ce1e3
-cmake-checksum = b47dfa3c825cd520a5a92d8092f39595d2c89992c94b7fc5f7a5cc6d009dc6f9164c31f1801188862e58e943da3f84167571c2253697eace7a819a4ba43bcc42
+cmake-checksum = 7d0abf2f7c661c6b555a7e93a2fce5ab5610c653b0aa4949bed6e97bfbe6523fd0665f67115d3944d3729cbe07ae3aaf780ee673b06dd80f90018cec8a999658
fftw-checksum = ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
freetype-checksum = 02f0f4211f9cee5b5e46ebe61190482fca5b41bc26be06fcf0d2d717e9fb119229308398c420eeea476fa2511ca2d52948f1a3242efad30ca82ed0b07cd50e3a
-ghostscript-checksum = 670159c23618ffafa85c671642bf182a107a82c053a1fd8c3f45f73f203524077be1b212d2ddbabae7892c7713922877e03b020f78bd2aab1ae582c4fc7d820a
+ghostscript-checksum = 9ad7bd24b6d9b7d258e943783817be036a2e0234517baffa1016804ef9b6f3062fb5da20a890a0bfc9e58203ddcf25dc4465f5b3bf5e4a61db87bef0606a0884
gnuastro-checksum = 6ff8e86f2834a08acf94295ae022736a3f31afd3c66c0d74b012d98e53c2184c42d6d4558997a85b268c5e3ebb258041fe2db2478435788b26c0b94068dd892e
-gsl-checksum = 5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a
+gsl-checksum = 0be8240715f0b86aba2c63d9f12da4dba4719d4e350e9308d279e0dd3b2f0519ea26fd2e38a17f3e8cf43aacbaa2455207a7ca0d6c305f3b8725e8ece2250a74
hdf5-checksum = f828ee9d63533effe1ad358230e5ce7b64c5016e49291d9533575f713cbfba496290fc0151fd9617898bdf36785984ddb38a9207f529d7702d4e23838fe050d8
imagemagick-checksum = 17faefa05e8535afc4636fca0228e8f903a2a3696943fbcdf9e541d5cc9072a98cf8070598be0baa19fa99609d207fc8314b274ea0baaa5395cb561c442a8ffc
imfit-checksum = 15edd2349232c1c8e611b31d3a46b0700112d274515f54d0a0085bb4bfa6d3d5f8a15cd926516e043a29ce841accf3534ae58dbfb952d858dc9445199c957096
@@ -125,7 +125,7 @@ yaml-checksum = 13d2197135946204323dbfccafa0ac7b3d05437e920545a56f46811fd7319c01
# modules/libraries below, please fix the hash strings of the respective
# URL in `reproduce/software/make/python.mk'.
asn1crypto-checksum = 44d442a6ddfa971e31e24712fe084368356deb5e1c4c3b3e813e0910931860215bc1c4f9eb2c4bd4fdef607c324086c096e9357068646efd28c97f2d4f85c62f
-astropy-checksum = f075502beb0d6336e9c3bb6839b2121262d3d5147f099bc60656805849f11564b06ed67dd7d257245e1925a98dca15bb874b33b4840c58a0173eef3c03711e98
+astropy-checksum = b468e6a6cd45052d4cd0cac34969ffa53f89ed8bdbdcd4aae627d4ce55043be24ba739534129b3fec1511b4f113a991209b819d5b3ad1429104f46cb205d26ec
astroquery-checksum = 0da57f687ac0aa7611cd97085771d79c99e9ac8c11f0828fcbc7390faf24e1e87d86812020e0ae8be1749f5f2ae9cb3733e5922d38a897a9e212247175c28e52
beautifulsoup4-checksum = 7aa77bc6008bbcbbbe91b0a850007ab237d2832b63a787fbd94b7cbf47d4276b185e0c61c134df73221406458edff2b75b6b8c2b53b543aa3bb1b0e2202dac5a
certifi-checksum = 6a6bf1ff98caefcdbf78a8c83e11e155368bacdd806f0ae0c6afa8f513667df6598e594b3584de61acdca3d6049f4a776937f2aa8672b602bd6db7b737f6074e
diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk
index 3f25a03..86c78f7 100644
--- a/reproduce/software/config/installation/versions.mk
+++ b/reproduce/software/config/installation/versions.mk
@@ -22,16 +22,16 @@
# Basic/low-level programs and libraires (installed in any case)
# --------------------------------------------------------------
-bash-version = 5.0.7
+bash-version = 5.0.11
binutils-version = 2.32
coreutils-version = 8.31
-curl-version = 7.65.1
+curl-version = 7.65.3
diffutils-version = 3.7
file-version = 5.36
-findutils-version = 4.6.0.199-e3fc
-gawk-version = 5.0.0
-gcc-version = 9.1.0
-git-version = 2.22.0
+findutils-version = 4.7.0
+gawk-version = 5.0.1
+gcc-version = 9.2.0
+git-version = 2.23.0
gmp-version = 6.1.2
grep-version = 3.3
gzip-version = 1.10
@@ -76,13 +76,13 @@ atlas-version = 3.10.3
cairo-version = 1.16.0
cdsclient-version = 3.84
cfitsio-version = 3.47
-cmake-version = 3.14.2
+cmake-version = 3.15.3
fftw-version = 3.3.8
flock-version = 0.2.3
freetype-version = 2.9
-ghostscript-version = 9.26
+ghostscript-version = 9.27
gnuastro-version = 0.10
-gsl-version = 2.5
+gsl-version = 2.6
hdf5-version = 1.10.5
imagemagick-version = 7.0.8-61
imfit-version = 1.6.1
@@ -120,7 +120,7 @@ yaml-version = 0.2.2
# modules/libraries below, please fix the hash strings of the respective
# URL in `reproduce/software/make/python.mk'.
asn1crypto-version = 0.24.0
-astropy-version = 3.1.1
+astropy-version = 3.2.1
astroquery-version = 0.3.9
beautifulsoup4-version = 4.7.1
certifi-version = 2018.11.29
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk
index 04edf1a..17ff561 100644
--- a/reproduce/software/make/basic.mk
+++ b/reproduce/software/make/basic.mk
@@ -111,7 +111,7 @@ tarballs = $(foreach t, bash-$(bash-version).tar.lz \
curl-$(curl-version).tar.gz \
diffutils-$(diffutils-version).tar.xz \
file-$(file-version).tar.gz \
- findutils-$(findutils-version).tar.lz \
+ findutils-$(findutils-version).tar.xz \
gawk-$(gawk-version).tar.lz \
gcc-$(gcc-version).tar.xz \
git-$(git-version).tar.xz \
@@ -124,7 +124,7 @@ tarballs = $(foreach t, bash-$(bash-version).tar.lz \
libtool-$(libtool-version).tar.xz \
lzip-$(lzip-version).tar.gz \
m4-$(m4-version).tar.gz \
- make-$(make-version).tar.lz \
+ make-$(make-version).tar.gz \
metastore-$(metastore-version).tar.gz \
mpfr-$(mpfr-version).tar.xz \
mpc-$(mpc-version).tar.gz \
@@ -158,7 +158,7 @@ $(tarballs): $(tdir)/%: | $(lockdir)
elif [ $$n = curl ]; then c=$(curl-checksum); w=https://curl.haxx.se/download; \
elif [ $$n = diffutils ]; then c=$(diffutils-checksum); w=http://ftp.gnu.org/gnu/diffutils;\
elif [ $$n = file ]; then c=$(file-checksum); w=ftp://ftp.astron.com/pub/file; \
- elif [ $$n = findutils ]; then c=$(findutils-checksum); w=http://akhlaghi.org/reproduce-software; \
+ elif [ $$n = findutils ]; then c=$(findutils-checksum); w=http://ftp.gnu.org/gnu/findutils; \
elif [ $$n = gawk ]; then c=$(gawk-checksum); w=http://ftp.gnu.org/gnu/gawk; \
elif [ $$n = gcc ]; then c=$(gcc-checksum); w=http://ftp.gnu.org/gnu/gcc/gcc-$(gcc-version); \
elif [ $$n = git ]; then c=$(git-checksum); w=http://mirrors.edge.kernel.org/pub/software/scm/git; \
@@ -174,7 +174,7 @@ $(tarballs): $(tdir)/%: | $(lockdir)
mergenames=0; \
c=$(m4-checksum); \
w=http://akhlaghi.org/reproduce-software/m4-1.4.18-patched.tar.gz; \
- elif [ $$n = make ]; then c=$(make-checksum); w=http://akhlaghi.org/reproduce-software; \
+ elif [ $$n = make ]; then c=$(make-checksum); w=https://alpha.gnu.org/gnu/make; \
elif [ $$n = metastore ]; then c=$(metastore-checksum); w=http://akhlaghi.org/reproduce-software; \
elif [ $$n = mpc ]; then c=$(mpc-checksum); w=http://ftp.gnu.org/gnu/mpc; \
elif [ $$n = mpfr ]; then c=$(mpfr-checksum); w=http://www.mpfr.org/mpfr-current;\
@@ -447,14 +447,14 @@ $(ibidir)/tar: $(tdir)/tar-$(tar-version).tar.gz \
# function (for tilde expansion). The first can be disabled with
# `--disable-load', but unfortunately I don't know any way to fix the
# second. So, we'll have to build it dynamically for now.
-$(ibidir)/make: $(tdir)/make-$(make-version).tar.lz \
+$(ibidir)/make: $(tdir)/make-$(make-version).tar.gz \
$(ibidir)/tar
# See Tar's comments for the `-j' option.
$(call gbuild, $<, make-$(make-version), , , -j$(numthreads)) \
&& echo "GNU Make $(make-version)" > $@
$(ibidir)/ncurses: $(tdir)/ncurses-$(ncurses-version).tar.gz \
- $(ibidir)/make
+ | $(ibidir)/make
# Delete the library that will be installed (so we can make sure
# the build process completed afterwards and reset the links).
@@ -553,7 +553,7 @@ $(ibidir)/readline: $(tdir)/readline-$(readline-version).tar.gz \
# either, see the `configure.sh' script where we define `good_static_libc'
# for more.
$(ibidir)/patchelf: $(tdir)/patchelf-$(patchelf-version).tar.gz \
- $(ibidir)/make
+ | $(ibidir)/make
if [ $(good_static_libc) = 1 ]; then \
export LDFLAGS="$$LDFLAGS -static"; \
fi; \
@@ -589,7 +589,7 @@ $(ibidir)/patchelf: $(tdir)/patchelf-$(patchelf-version).tar.gz \
# $ mv bash-5.0 bash-5.0.$number
# $ tar cf bash-5.0.$number.tar bash-5.0.$number
# $ lzip --best bash-5.0.$number.tar
-# $ rm bash50-*
+# $ rm -rf bash50-* bash-5.0.$number bash-5.0.tar.gz
ifeq ($(on_mac_os),yes)
needpatchelf =
@@ -674,7 +674,7 @@ $(ibidir)/bash: $(tdir)/bash-$(bash-version).tar.lz \
# an error).
$(ibidir)/coreutils: $(tdir)/coreutils-$(coreutils-version).tar.xz \
$(ibidir)/openssl \
- $(ibidir)/bash
+ | $(ibidir)/bash
cd $(ddir) \
&& rm -rf coreutils-$(coreutils-version) \
&& if ! tar xf $<; then echo; echo "Tar error"; exit 1; fi \
@@ -719,7 +719,8 @@ $(ibidir)/coreutils: $(tdir)/coreutils-$(coreutils-version).tar.xz \
$(idir)/etc:; mkdir $@
$(ibidir)/openssl: $(tdir)/openssl-$(openssl-version).tar.gz \
$(tdir)/cert.pem \
- $(ibidir)/make | $(idir)/etc
+ | $(idir)/etc \
+ $(ibidir)/make
# According to OpenSSL's Wiki (link bellow), it can't automatically
# detect Mac OS's structure. It will need some help. So we'll use
# the `on_mac_os' Make variable that we defined in the configure
@@ -765,9 +766,7 @@ $(ibidir)/openssl: $(tdir)/openssl-$(openssl-version).tar.gz \
# when the library is updated/changed by the host, and the whole purpose of
# this project is avoid dependency on the host as much as possible.
$(ibidir)/curl: $(tdir)/curl-$(curl-version).tar.gz \
- $(ibidir)/coreutils \
- $(ibidir)/openssl \
- $(needpatchelf)
+ | $(ibidir)/coreutils
$(call gbuild, $<, curl-$(curl-version), , \
LIBS="-pthread" \
--with-zlib=$(ildir) \
@@ -805,8 +804,8 @@ $(ibidir)/curl: $(tdir)/curl-$(curl-version).tar.gz \
# host system (especially a crash when these libraries are updated on the
# host), they are disabled here.
$(ibidir)/wget: $(tdir)/wget-$(wget-version).tar.lz \
- $(ibidir)/coreutils \
- $(ibidir)/libiconv
+ $(ibidir)/libiconv \
+ | $(ibidir)/coreutils
# We need to explicitly disable `libiconv', because of the
# `pkg-config' and `libiconv' problem.
@@ -841,22 +840,22 @@ $(ibidir)/wget: $(tdir)/wget-$(wget-version).tar.lz \
# building of those higher-level programs (after this Makefile finishes),
# there is no access to the system's PATH.
$(ibidir)/diffutils: $(tdir)/diffutils-$(diffutils-version).tar.xz \
- $(ibidir)/coreutils
+ | $(ibidir)/coreutils
$(call gbuild, $<, diffutils-$(diffutils-version), static, , V=1) \
&& echo "GNU Diffutils $(diffutils-version)" > $@
$(ibidir)/file: $(tdir)/file-$(file-version).tar.gz \
- $(ibidir)/coreutils
+ | $(ibidir)/coreutils
$(call gbuild, $<, file-$(file-version), static) \
&& echo "File $(file-version)" > $@
-$(ibidir)/findutils: $(tdir)/findutils-$(findutils-version).tar.lz \
- $(ibidir)/coreutils
+$(ibidir)/findutils: $(tdir)/findutils-$(findutils-version).tar.xz \
+ | $(ibidir)/coreutils
$(call gbuild, $<, findutils-$(findutils-version), static, , V=1) \
&& echo "GNU Findutils $(findutils-version)" > $@
$(ibidir)/gawk: $(tdir)/gawk-$(gawk-version).tar.lz \
- $(ibidir)/coreutils \
+ | $(ibidir)/coreutils \
$(ibidir)/mpfr \
$(ibidir)/gmp
# AWK doesn't include RPATH by default, so we'll have to manually
@@ -894,32 +893,32 @@ $(ibidir)/git: $(tdir)/git-$(git-version).tar.xz \
&& echo "Git $(git-version)" > $@
$(ibidir)/gmp: $(tdir)/gmp-$(gmp-version).tar.lz \
- $(ibidir)/coreutils \
- $(ibidir)/m4
+ | $(ibidir)/coreutils \
+ $(ibidir)/m4
$(call gbuild, $<, gmp-$(gmp-version), static, , , make check) \
&& echo "GNU Multiple Precision Arithmetic Library $(gmp-version)" > $@
# On Mac OS, libtool does different things, so to avoid confusion, we'll
# prefix GNU's libtool executables with `glibtool'.
$(ibidir)/glibtool: $(tdir)/libtool-$(libtool-version).tar.xz \
- $(ibidir)/m4
+ | $(ibidir)/m4
$(call gbuild, $<, libtool-$(libtool-version), static, \
--program-prefix=g) \
&& echo "GNU Libtool $(libtool-version)" > $@
$(ibidir)/grep: $(tdir)/grep-$(grep-version).tar.xz \
- $(ibidir)/coreutils
+ | $(ibidir)/coreutils
$(call gbuild, $<, grep-$(grep-version), static) \
&& echo "GNU Grep $(grep-version)" > $@
$(ibidir)/libbsd: $(tdir)/libbsd-$(libbsd-version).tar.xz \
- $(ibidir)/coreutils
+ | $(ibidir)/coreutils
$(call gbuild, $<, libbsd-$(libbsd-version), static,,V=1) \
&& echo "Libbsd $(libbsd-version)" > $@
$(ibidir)/m4: $(tdir)/m4-$(m4-version).tar.gz \
- $(ibidir)/coreutils \
- $(ibidir)/texinfo
+ | $(ibidir)/coreutils \
+ $(ibidir)/texinfo
$(call gbuild, $<, m4-$(m4-version), static) \
&& echo "GNU M4 $(m4-version)" > $@
@@ -946,11 +945,11 @@ else
needlibbsd = $(ibidir)/libbsd
endif
$(ibidir)/metastore: $(tdir)/metastore-$(metastore-version).tar.gz \
- $(ibidir)/coreutils \
- $(ibidir)/gawk \
- $(ibidir)/git \
- $(ibidir)/sed \
- $(needlibbsd)
+ $(needlibbsd) \
+ | $(ibidir)/coreutils \
+ $(ibidir)/gawk \
+ $(ibidir)/git \
+ $(ibidir)/sed
# Metastore doesn't have any `./configure' script. So we'll just
# call `pwd' as a place-holder for the `./configure' command.
@@ -1007,7 +1006,7 @@ $(ibidir)/mpfr: $(tdir)/mpfr-$(mpfr-version).tar.xz \
&& echo "GNU Multiple Precision Floating-Point Reliably $(mpfr-version)" > $@
$(ibidir)/pkg-config: $(tdir)/pkg-config-$(pkgconfig-version).tar.gz \
- $(ibidir)/coreutils
+ | $(ibidir)/coreutils
# An existing `libiconv' can cause a conflict with `pkg-config',
# this is why `libiconv' depends on `pkg-config'. On a clean build,
# `pkg-config' is built first. But when we don't have a clean build
@@ -1029,12 +1028,12 @@ $(ibidir)/pkg-config: $(tdir)/pkg-config-$(pkgconfig-version).tar.gz \
&& echo "pkg-config $(pkgconfig-version)" > $@
$(ibidir)/sed: $(tdir)/sed-$(sed-version).tar.xz \
- $(ibidir)/coreutils
+ | $(ibidir)/coreutils
$(call gbuild, $<, sed-$(sed-version), static) \
&& echo "GNU Sed $(sed-version)" > $@
$(ibidir)/texinfo: $(tdir)/texinfo-$(texinfo-version).tar.xz \
- $(ibidir)/bash
+ | $(ibidir)/bash
$(call gbuild, $<, texinfo-$(texinfo-version), static) \
&& if [ "x$(needpatchelf)" != x ]; then \
$(ibdir)/patchelf --set-rpath $(ildir) $(ibdir)/info; \
@@ -1043,7 +1042,7 @@ $(ibidir)/texinfo: $(tdir)/texinfo-$(texinfo-version).tar.xz \
&& echo "GNU Texinfo $(sed-version)" > $@
$(ibidir)/which: $(tdir)/which-$(which-version).tar.gz \
- $(ibidir)/coreutils
+ | $(ibidir)/coreutils
$(call gbuild, $<, which-$(which-version), static) \
&& echo "GNU Which $(which-version)" > $@
diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk
index 196eea7..d246ce1 100644
--- a/reproduce/software/make/high-level.mk
+++ b/reproduce/software/make/high-level.mk
@@ -195,7 +195,10 @@ $(tarballs): $(tdir)/%: | $(lockdir)
w=https://cmake.org/files/v$$majv/cmake-$(cmake-version).tar.gz
elif [ $$n = fftw ]; then c=$(fftw-checksum); w=ftp://ftp.fftw.org/pub/fftw
elif [ $$n = freetype ]; then c=$(freetype-checksum); w=https://download.savannah.gnu.org/releases/freetype
- elif [ $$n = ghostscript ]; then c=$(ghostscript-checksum); w=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs926
+ elif [ $$n = ghostscript ]; then
+ c=$(ghostscript-checksum)
+ v=$$(echo $(ghostscript-version) | sed -e's/\.//')
+ w=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$$v
elif [ $$n = gnuastro ]; then c=$(gnuastro-checksum); w=http://ftp.gnu.org/gnu/gnuastro
elif [ $$n = gsl ]; then c=$(gsl-checksum); w=http://ftp.gnu.org/gnu/gsl
elif [ $$n = hdf ]; then
diff --git a/reproduce/software/make/python.mk b/reproduce/software/make/python.mk
index 0dfce31..994bec4 100644
--- a/reproduce/software/make/python.mk
+++ b/reproduce/software/make/python.mk
@@ -156,7 +156,7 @@ $(pytarballs): $(tdir)/%:
h=$(pytopurl)/$$hash/SecretStorage-$(secretstorage-version).tar.gz
elif [ $$n = asn ]; then h=fc/f1/8db7daa71f414ddabfa056c4ef792e1461ff655c2ae2928a2b675bfed6b4; c=$(asn1crypto-checksum)
elif [ $$n = astroquery ]; then h=61/50/a7a08f9e54d7d9d97e69433cd88231e1ad2901811c9d1ae9ac7ccaef9396; c=$(astroquery-checksum)
- elif [ $$n = astropy ]; then h=eb/f7/1251bf6881861f24239efe0c24cbcfc4191ccdbb69ac3e9bb740d0c23352; c=$(astropy-checksum)
+ elif [ $$n = astropy ]; then h=b9/10/523355eb8cb9839552c8f0fbc9425a1c87c8ff2e55f4df85469a5a4164d3; c=$(astropy-checksum)
elif [ $$n = beautifulsoup ]; then h=80/f2/f6aca7f1b209bb9a7ef069d68813b091c8c3620642b568dac4eb0e507748; c=$(beautifulsoup4-checksum)
elif [ $$n = certifi ]; then h=55/54/3ce77783acba5979ce16674fc98b1920d00b01d337cfaaf5db22543505ed; c=$(certifi-checksum)
elif [ $$n = cffi ]; then h=64/7c/27367b38e6cc3e1f49f193deb761fe75cda9f95da37b67b422e62281fcac; c=$(cffi-checksum)
--
cgit v1.2.1