diff options
| author | Raul Infante-Sainz <infantesainz@gmail.com> | 2019-03-06 17:12:19 +0000 |
|---|---|---|
| committer | Raul Infante-Sainz <infantesainz@gmail.com> | 2019-03-06 17:12:19 +0000 |
| commit | 41865272cd80856eb466daef029a669225dbf139 (patch) | |
| tree | bc77d553e92432c91530c9bbc4a466e16fa0d67d /reproduce/src/make/dependencies.mk | |
| parent | a57c91cfdb05cf5cd790823f40d443648f3fc21a (diff) | |
Astroquery, astropy, matplotlib and numpy are now in the pipeline
Until this commit, we had some of the python packages intalled
but they did not work properly because of the `PYTHONPATH' variables.
That is, the pipeline's `python' was the `python' of the system
instead of the pipeline's `python'.
With this commit this issue has been fixed by setting the correct
`PYTHONPATH'. In this commit we also modify the installation of
`bzip2' because `CMake' was complaining about some libraries built
statically.
Diffstat (limited to 'reproduce/src/make/dependencies.mk')
| -rw-r--r-- | reproduce/src/make/dependencies.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk index e1b409e..deb9f39 100644 --- a/reproduce/src/make/dependencies.mk +++ b/reproduce/src/make/dependencies.mk @@ -242,7 +242,8 @@ $(ilidir)/libjpeg: $(tdir)/jpegsrc.$(libjpeg-version).tar.gz $(call gbuild, $<, jpeg-9b, static) && echo "Libjpeg is built" > $@ $(ilidir)/libpng: $(tdir)/libpng-$(libpng-version).tar.xz - $(call gbuild, $<, libpng, static) && echo "Libpng is built" > $@ + $(call gbuild, $<, libpng-$(libpng-version), static) \ + && echo "Libpng is built" > $@ $(ilidir)/libtiff: $(tdir)/tiff-$(libtiff-version).tar.gz \ $(ilidir)/libjpeg |