Mercurial > mxe-octave
changeset 6236:d3d051b4515f
cfitsio: update to v4.1.0
* src/cfitsio.mk: update version, update rule
* src/mingw-cfitsio-1-fixes.patch: update patch
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Fri, 27 May 2022 14:24:31 -0400 |
| parents | 3d86598a6b7f |
| children | 97ad836259c3 |
| files | src/cfitsio.mk src/mingw-cfitsio-1-fixes.patch |
| diffstat | 2 files changed, 17 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cfitsio.mk Fri May 27 12:54:43 2022 +0200 +++ b/src/cfitsio.mk Fri May 27 14:24:31 2022 -0400 @@ -3,10 +3,10 @@ PKG := cfitsio $(PKG)_IGNORE := -$(PKG)_VERSION := 3450 -$(PKG)_CHECKSUM := 85b4adeba79a7691114695e6bafd6d968e68c21f -$(PKG)_SUBDIR := $(PKG) -$(PKG)_FILE := $(PKG)$($(PKG)_VERSION).tar.gz +$(PKG)_VERSION := 4.1.0 +$(PKG)_CHECKSUM := 3c63ceccc4de3495b22d5a92e849d2ce027d07a6 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/$($(PKG)_FILE) $(PKG)_DEPS := curl @@ -23,7 +23,7 @@ define $(PKG)_UPDATE $(WGET) -q -O- "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/?C=M;O=D" | \ grep -i '<a href="cfitsio.*tar' | \ - $(SED) -n 's,.*cfitsio\([0-9][^>]*\)\.tar.*,\1,p' | \ + $(SED) -n 's,.*cfitsio-\([0-9\.][^>]*\)\.tar.*,\1,p' | \ head -1 endef
--- a/src/mingw-cfitsio-1-fixes.patch Fri May 27 12:54:43 2022 +0200 +++ b/src/mingw-cfitsio-1-fixes.patch Fri May 27 14:24:31 2022 -0400 @@ -1,12 +1,12 @@ -diff -ur cfitsio.orig/configure.in cfitsio/configure.in ---- cfitsio.orig/configure.in 2019-03-05 10:42:18.453397421 -0500 -+++ cfitsio/configure.in 2019-03-05 10:44:29.464686105 -0500 -@@ -452,7 +452,7 @@ - else - AC_CHECK_PROG([CURLCONFIG], [curl-config], [curl-config], [], [], [/opt/local/bin/curl-config]) - fi --if test "x$CURLCONFIG" != x; then -+if test "x$CURLCONFIG" != x && test "x$CURLCONFIG" != "xnone" ; then - CURL_LIB=`$CURLCONFIG --libs` - CURL_INC=`$CURLCONFIG --cflags` - # Also reject anaconda curl on Macs until further notice: +diff -ur cfitsio-4.1.0.orig/configure.in cfitsio-4.1.0/configure.in +--- cfitsio-4.1.0.orig/configure.in 2022-05-26 08:43:32.205001801 -0400 ++++ cfitsio-4.1.0/configure.in 2022-05-26 08:44:53.020552448 -0400 +@@ -489,7 +489,7 @@ + if test "x$ADD_CURL" = xyes; then + # Use curl-config to get compiler & linker flags, if available. + AC_CHECK_PROG([CURLCONFIG], [curl-config], [curl-config], [], [], []) +- if test "x$CURLCONFIG" != x; then ++ if test "x$CURLCONFIG" != x && test "x$CURLCONFIG" != "xnone"; then + CURL_LIB=`$CURLCONFIG --libs` + CURL_INC=`$CURLCONFIG --cflags` + if test "x$CURL_LIB" != x; then