diff options
| author | Raul Infante-Sainz <infantesainz@gmail.com> | 2019-04-27 13:51:38 +0100 |
|---|---|---|
| committer | Raul Infante-Sainz <infantesainz@gmail.com> | 2019-04-27 13:51:38 +0100 |
| commit | fc375571f51b044ca7255a1b6ff67d433ff0813e (patch) | |
| tree | b43f52f669a79f42f1922072a074aa750839825d /reproduce/software | |
| parent | fee22fe7b91fd7df35dcb846df2040b10d88fb16 (diff) | |
Modified netpbm installation answers for Mac OS systems
Until now, we installed `netpbm' by setting the default paths to
libraries and headers. That worked fine for GNU/Linux systems, however,
in Mac OS systems we have to explicity say to `netpbm' questions what
are the paths to the libraries and headers. We found this problem
because we tried to run `solve-field' to obtain the astrometry of some
images, and then it goes to use `pnmfile', a program that failed because
it was not properly linked with `libnetpmb'.
With this commit, we fix this problem by answering properly the
questions in the configure step of `netpbm' and setting explicity where
we want to place the libraries and headers. With this commit, we also
update `netpbm' version. To do that, we have to download the last
version, for which it doesn't exist a tarball. So, we built this tarball
and put it in the Mohammad's webpage.
Diffstat (limited to 'reproduce/software')
| -rw-r--r-- | reproduce/software/config/installation/versions.mk | 6 | ||||
| -rw-r--r-- | reproduce/software/make/high-level.mk | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk index df2b4fa..e6c1c89 100644 --- a/reproduce/software/config/installation/versions.mk +++ b/reproduce/software/config/installation/versions.mk @@ -86,7 +86,6 @@ libjpeg-version = v9b libtiff-version = 4.0.10 libtool-version = 2.4.6 libxml2-version = 2.9.9 -netpbm-version = 10.47.72 openblas-version = 0.3.5 openmpi-version = 4.0.1 pixman-version = 0.38.0 @@ -160,7 +159,9 @@ webencodings-version = 0.5.1 # # Special notes: # - `libpng' is downgraded: the current installation of `netpbm' requires -# a version less than 1.5. +# a version less than 1.5. +# - `netpbm' questions in the configure steps maybe change with different +# or new versions. # Basic/low-level bzip2-version = 1.0.6 @@ -169,4 +170,5 @@ bzip2-version = 1.0.6 lapack-version = 3.8.0 libgit2-version = 0.26.0 libpng-version = 1.4.22 +netpbm-version = 10.86.99 wcslib-version = 6.2 diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 43d1bbb..56adf8e 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -123,7 +123,7 @@ tarballs = $(foreach t, astrometry.net-$(astrometrynet-version).tar.gz \ libpng-$(libpng-version).tar.xz \ libgit2-$(libgit2-version).tar.gz \ libxml2-$(libxml2-version).tar.gz \ - netpbm-$(netpbm-version).tgz \ + netpbm-$(netpbm-version).tar.gz \ openmpi-$(openmpi-version).tar.gz \ openblas-$(openblas-version).tar.gz \ pixman-$(pixman-version).tar.gz \ @@ -183,9 +183,7 @@ $(tarballs): $(tdir)/%: | $(lockdir) mergenames=0 w=https://github.com/libgit2/libgit2/archive/v$(libgit2-version).tar.gz elif [ $$n = libxml ]; then w=ftp://xmlsoft.org/libxml2 - elif [ $$n = netpbm ]; then - mergenames=0 - w=https://sourceforge.net/projects/netpbm/files/super_stable/$(netpbm-version)/netpbm-$(netpbm-version).tgz/download + elif [ $$n = netpbm ]; then w=http://akhlaghi.org/src elif [ $$n = openblas ]; then mergenames=0 w=https://github.com/xianyi/OpenBLAS/archive/v$(openblas-version).tar.gz @@ -587,14 +585,14 @@ endif # ask to the user. We give all answers with a pipe to the scripts (configure # and install). The questions are different depending on the system (tested # on GNU/Linux and Mac OS). -$(ibidir)/netpbm: $(tdir)/netpbm-$(netpbm-version).tgz \ +$(ibidir)/netpbm: $(tdir)/netpbm-$(netpbm-version).tar.gz\ $(ibidir)/libjpeg \ $(ibidir)/libpng \ $(ibidir)/libtiff \ $(ibidir)/libxml2 \ $(ibidir)/unzip if [ x$(on_mac_os) = xyes ]; then \ - answers='\n\n\n\n\n\n\n\n\n\n\n\nnone\n\n\n'; \ + answers='\n\n$(ildir)\n\n\n\n\n\n$(ildir)/include\n\n$(ildir)/include\n\n$(ildir)/include\nnone\n\n'; \ else \ answers='\n\n\n\ny\n\n\n\n\n\n\n\n\n\n\n\n\n'; \ fi; \ |