From 268dfc0368fc21c8a4da695cf23e94c7cf2472c1 Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Fri, 24 May 2019 12:52:51 +0100 Subject: Shared CFITSIO installation included By default (when you run `make' within CFITSIO), it only builds a static library. So until now, the template would only install a static version of this library. To be more clear about which libraries are used during the linking of programs that use CFITSIO, it would be helpful to have shared library versions also. Also, if the system has problems with static libraries (like macOS systems), then it won't go looking outside the template to link with them (these paths are hardcoded in the linker, which we don't build on macOS and just use the system's tools). With this commit, we are explicity running `make shared' in the CFITSIO installation to have shared CFITSIO also. I also removed the old `static' element (which we don't use anymore in any of the programs and have to remove some time later!). --- .file-metadata | Bin 6829 -> 6001 bytes reproduce/software/make/high-level.mk | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.file-metadata b/.file-metadata index f65476f..05731d6 100644 Binary files a/.file-metadata and b/.file-metadata differ diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index b2d9d7e..cdaae5e 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -264,8 +264,9 @@ $(ibidir)/cfitsio: $(tdir)/cfitsio-$(cfitsio-version).tar.gz \ cd $$topdir # Continue the standard build on the customized tarball. - $(call gbuild, $$customtar, cfitsio, static, \ - --enable-sse2 --enable-reentrant) \ + $(call gbuild, $$customtar, cfitsio, , \ + --enable-sse2 --enable-reentrant, , \ + make shared) \ && rm $$customtar \ && echo "CFITSIO $(cfitsio-version)" > $@ -- cgit v1.2.1