diff options
| author | Raul Infante-Sainz <infantesainz@gmail.com> | 2019-04-11 10:16:37 +0100 |
|---|---|---|
| committer | Raul Infante-Sainz <infantesainz@gmail.com> | 2019-04-11 10:16:37 +0100 |
| commit | 7540d7d7b3c57b2442002e46a7e879f31e503752 (patch) | |
| tree | 460c6670e8be12e7531f2a130d26beb2e82e8d0f | |
| parent | 9282e53e0e195d21e6fcccabd32377983b93c3e9 (diff) | |
Unzip set as prerequisite of Numpy and Setuptools
Since we mixed the installation of Python packages with all other
software, it may occur that some Python packages start to be installed
before having installed `unzip'. As a consecuence, they could not be
decompressed and the installation will fail. In particular, tarballs of
Numpy and Setuptools are .zip files.
With this commit, we fix this issue by setting `unzip' as a prerequisit
of Numpy and Setuptools.
| -rw-r--r-- | .file-metadata | bin | 4780 -> 4780 bytes | |||
| -rw-r--r-- | reproduce/src/make/dependencies-python.mk | 6 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.file-metadata b/.file-metadata Binary files differindex 115bae6..d1dea6f 100644 --- a/.file-metadata +++ b/.file-metadata diff --git a/reproduce/src/make/dependencies-python.mk b/reproduce/src/make/dependencies-python.mk index 5b12757..a6634ff 100644 --- a/reproduce/src/make/dependencies-python.mk +++ b/reproduce/src/make/dependencies-python.mk @@ -410,7 +410,8 @@ $(ipydir)/mpi4py: $(tdir)/mpi4py-$(mpi4py-version).tar.gz \ $(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 \ @@ -473,7 +474,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)) |