From fc375571f51b044ca7255a1b6ff67d433ff0813e Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Sat, 27 Apr 2019 13:51:38 +0100 Subject: 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. --- reproduce/software/config/installation/versions.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'reproduce/software/config/installation') 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 -- cgit v1.2.1 From 98176063ff38962080772b47104911a607131428 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Sat, 27 Apr 2019 15:11:55 +0100 Subject: Libpng updated (version 1.6.37) Until this commit, we were using `libpng' version 1.4.22 (out dated). The reason is that with `libpng` versions > 1.5, there was some problems with `netpbm'. But we have update `netpbm' version and now there is no conflict betweem them. With this commit, we increase the version of `libpng' to have the most recent one. --- reproduce/software/config/installation/versions.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'reproduce/software/config/installation') diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk index e6c1c89..5c7743d 100644 --- a/reproduce/software/config/installation/versions.mk +++ b/reproduce/software/config/installation/versions.mk @@ -83,6 +83,7 @@ gsl-version = 2.5 hdf5-version = 1.10.5 libffi-version = 3.2.1 libjpeg-version = v9b +libpng-version = 1.6.37 libtiff-version = 4.0.10 libtool-version = 2.4.6 libxml2-version = 2.9.9 @@ -158,8 +159,6 @@ webencodings-version = 0.5.1 # during their build and must be accounted for. # # Special notes: -# - `libpng' is downgraded: the current installation of `netpbm' requires -# a version less than 1.5. # - `netpbm' questions in the configure steps maybe change with different # or new versions. @@ -169,6 +168,5 @@ bzip2-version = 1.0.6 # Optional/high-level lapack-version = 3.8.0 libgit2-version = 0.26.0 -libpng-version = 1.4.22 netpbm-version = 10.86.99 wcslib-version = 6.2 -- cgit v1.2.1 From 389d6e2862a0ecf0a6d849a915b02a17b304e45a Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Mon, 29 Apr 2019 10:56:26 +0100 Subject: Modified copyright information of some files With this commit, the copyright information of some files have been modify in order to include the work of Raul Infante-Sainz. --- reproduce/software/config/installation/TARGETS.mk | 1 + reproduce/software/config/installation/numpy-scipy.cfg | 1 + 2 files changed, 2 insertions(+) (limited to 'reproduce/software/config/installation') diff --git a/reproduce/software/config/installation/TARGETS.mk b/reproduce/software/config/installation/TARGETS.mk index 4b1ff2e..b9157f1 100644 --- a/reproduce/software/config/installation/TARGETS.mk +++ b/reproduce/software/config/installation/TARGETS.mk @@ -1,6 +1,7 @@ # Necessary high-level software to build in this project. # # Copyright (C) 2018-2019 Mohammad Akhlaghi +# Copyright (C) 2019 Raul Infante-Sainz # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice and diff --git a/reproduce/software/config/installation/numpy-scipy.cfg b/reproduce/software/config/installation/numpy-scipy.cfg index 4b7a7b0..03038ed 100644 --- a/reproduce/software/config/installation/numpy-scipy.cfg +++ b/reproduce/software/config/installation/numpy-scipy.cfg @@ -8,6 +8,7 @@ # should leave out sections that your package does not use. # # Copyright (C) 2018-2019 Mohammad Akhlaghi +# Copyright (C) 2019 Raul Infante-Sainz # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice and -- cgit v1.2.1