diff options
| author | Boud Roukema <boud@cosmo.torun.pl> | 2020-04-26 16:20:37 +0200 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-27 00:22:20 +0100 |
| commit | a21ea20c54628989b9737e9aa2ecd72806456307 (patch) | |
| tree | a31ccdce097ec4eb80fd885ff7163fa982a87800 /reproduce/software/config | |
| parent | 3409a54c74e522ebac48546c2c5347dea6aeee16 (diff) | |
Configuration: improved version separation from tarball name
Until now, the sed script for determining URL download rules in the three
software building Makefiles (`basic.mk', `high-level.mk' and `python.mk')
considered package names such as `fftw-3...` and `fftw2-2.1...` to be
identical. As the example above shows, this would make it hard to include
some software that may hav conflicting non-number names.
With this commit, the SED script that is used to separate the version from
the tarball name only matches numbers that are after a dash
(`-'). Therefore considers `fftw-3...` and `fftw-2...` to be identical, but
`fftw-3-...` and `fftw2-2.1...` to be different. As a result of this
change, the `elif' check for some of the other programs like `m4', or
`help2man' was also corrected in all three Makefiles.
While doing this check on all the software, we noticed that `zlib-version'
is being repeated two times in `version.conf' so it was removed. It caused
no complications, because both were the same number, but could lead to bugs
later.
Diffstat (limited to 'reproduce/software/config')
| -rw-r--r-- | reproduce/software/config/versions.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/reproduce/software/config/versions.conf b/reproduce/software/config/versions.conf index 1b6de7c..35ede19 100644 --- a/reproduce/software/config/versions.conf +++ b/reproduce/software/config/versions.conf @@ -213,6 +213,6 @@ libgit2-version = 0.28.2 netpbm-version = 10.86.99 wcslib-version = 6.4 -# Minizip is installed as a part of `zlib', and they have the same version. -zlib-version = 1.2.11 +# Minizip is installed with the same `zlib' tarball, and they have the same +# version. minizip-version = $(zlib-version) |