diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-05-24 12:52:51 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-05-24 12:52:51 +0100 |
| commit | 268dfc0368fc21c8a4da695cf23e94c7cf2472c1 (patch) | |
| tree | 9a7224dd447d58a9ff729392607838d01edd0842 | |
| parent | 51bae08d52d3e6013b3b0fbfb4e5193e9f7b06f4 (diff) | |
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!).
| -rw-r--r-- | .file-metadata | bin | 6829 -> 6001 bytes | |||
| -rw-r--r-- | reproduce/software/make/high-level.mk | 5 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.file-metadata b/.file-metadata Binary files differindex f65476f..05731d6 100644 --- a/.file-metadata +++ b/.file-metadata 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)" > $@ |