diff options
| -rw-r--r-- | reproduce/software/config/installation/checksums.mk | 2 | ||||
| -rw-r--r-- | reproduce/software/config/installation/versions.mk | 2 | ||||
| -rw-r--r-- | reproduce/software/make/high-level.mk | 18 |
3 files changed, 5 insertions, 17 deletions
diff --git a/reproduce/software/config/installation/checksums.mk b/reproduce/software/config/installation/checksums.mk index 5103086..2f2a9a7 100644 --- a/reproduce/software/config/installation/checksums.mk +++ b/reproduce/software/config/installation/checksums.mk @@ -109,7 +109,7 @@ sextractor-checksum = 4035710f9b8a20a0bb1a3913dab2dadd8444c179bf6dee425e0e8bb66a swarp-checksum = 80f4ade59738df3d4c9b47bda04148b53c6ba995d523fa8d1e02fb5d952b6078a53cc7d273849a033505de127a4f318b95adf2bf5a2dc38e8cc9bdaf5658487a swig-checksum = 5eaa2e06d8e4197fd02194051db1e518325dbb074a4c55a91099ad9c55193874f577764afc9029409a41bd520a95154095f26e33ef5add5c102bb2c1d98d33eb tides-checksum = c3360ff0d023b43749ba09a33302ca059f017a157b3ce7cdcf4f1a1578e90d3e7fa420077043adbee6b1ebf94bd698c8d6b279012f36d2a05b4de5351e30e108 -wcslib-checksum = fb438c8f9f7540a4cec8d7468f009f8f185c34524b862b6bd412bb5c9154e12c8e660eed91fb55a4d42f64da143672e7cda58f746749f87f6ff7c7f47b644ef8 +wcslib-checksum = fed47771defb2a93fb50aa2e701c46f8ce35773dd3de91eeaed311b5a0474c096c7f9be6996fe95f82faa30b1d5c0aba892bca5da80bc32b15919dfaf551aeb7 yaml-checksum = 13d2197135946204323dbfccafa0ac7b3d05437e920545a56f46811fd7319c01419a58083090ce85fccd4d6901a620ceb9f1190078cc0830bc0ce769bb024f51 diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk index 7105f59..9ad5f66 100644 --- a/reproduce/software/config/installation/versions.mk +++ b/reproduce/software/config/installation/versions.mk @@ -181,4 +181,4 @@ bzip2-version = 1.0.6 lapack-version = 3.8.0 libgit2-version = 0.28.2 netpbm-version = 10.86.99 -wcslib-version = 6.3 +wcslib-version = 6.4 diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 96cdb23..fc2d7a4 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -568,28 +568,16 @@ $(ibidir)/libgit2: $(tdir)/libgit2-$(libgit2-version).tar.gz \ fi \ && echo "Libgit2 $(libgit2-version)" > $@ -# LIBS with `-lcfitsio': For some reason WCSLIB 6.3 has some linking -# problems on some versions of macOS, giving the following error: -# -# Undefined symbols for architecture x86_64: -# "_fits_read_wcstab", referenced from: -# _ftwcst_ in getwcstab_f.o -# "_gFitsFiles", referenced from: -# _ftwcst_ in getwcstab_f.o -# ld: symbol(s) not found for architecture x86_64 -# -# For the time being, the best/most-generic solution we found was to -# explicitly force linking with CFITSIO (which happens anyway). $(ibidir)/wcslib: $(tdir)/wcslib-$(wcslib-version).tar.bz2 \ $(ibidir)/cfitsio $(call gbuild, $<, wcslib-$(wcslib-version), , \ - LIBS="-pthread -lcfitsio -lcurl -lm" \ + LIBS="-pthread -lcurl -lm" \ --with-cfitsiolib=$(ildir) \ --with-cfitsioinc=$(idir)/include \ --without-pgplot) \ && if [ x$(on_mac_os) = xyes ]; then \ - install_name_tool -id $(ildir)/libwcs.6.3.dylib \ - $(ildir)/libwcs.6.3.dylib; \ + install_name_tool -id $(ildir)/libwcs.6.4.dylib \ + $(ildir)/libwcs.6.4.dylib; \ fi \ && echo "WCSLIB $(wcslib-version)" > $@ |