Mercurial > mxe-octave

changeset 4997:97fc509bb1df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cfitsio: update tp v3.45 * src/cfitsio.mk: update version, checksum, in mingw disable curl * src/mingw-cfitsio-1-fixes.patch: updated patch
author John Donoghue
date Tue, 05 Mar 2019 11:58:31 -0500
parents 3f3beb75a336
children a7ff8e192f64
files src/cfitsio.mk src/mingw-cfitsio-1-fixes.patch
diffstat 2 files changed, 20 insertions(+), 143 deletions(-) [+]
line wrap: on
line diff
--- a/src/cfitsio.mk	Mon Mar 04 12:12:12 2019 -0500
+++ b/src/cfitsio.mk	Tue Mar 05 11:58:31 2019 -0500
@@ -3,8 +3,8 @@
 
 PKG             := cfitsio
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3410
-$(PKG)_CHECKSUM := 09a77d3a6b13f2c788edfad16cdc479dc5f42961
+$(PKG)_VERSION  := 3450
+$(PKG)_CHECKSUM := 85b4adeba79a7691114695e6bafd6d968e68c21f
 $(PKG)_SUBDIR   := $(PKG)
 $(PKG)_FILE     := $(PKG)$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/$($(PKG)_FILE)
@@ -15,6 +15,11 @@
   $(PKG)_MAKE_FLAGS += shared
 endif
 
+$(PKG)_CONFIGURE_FLAGS :=
+ifeq ($(MXE_SYSTEM),mingw)
+  $(PKG)_CONFIGURE_FLAGS += CURLCONFIG=none
+endif
+
 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' | \
@@ -48,9 +53,10 @@
 endef
 else
 define $(PKG)_BUILD
-    cd '$(1)' && '$(1)/configure' \
+    cd '$(1)' && autoreconf -fi && '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+	$($(PKG)_CONFIGURE_FLAGS) \
         --prefix='$(HOST_PREFIX)' 
     $(MAKE) -C '$(1)' -j '$(JOBS)' $($(PKG)_MAKE_FLAGS)
     $(MAKE) -C '$(1)' -j 1 install
--- a/src/mingw-cfitsio-1-fixes.patch	Mon Mar 04 12:12:12 2019 -0500
+++ b/src/mingw-cfitsio-1-fixes.patch	Tue Mar 05 11:58:31 2019 -0500
@@ -1,141 +1,12 @@
-diff -ur cfitsio.orig/configure cfitsio/configure
---- cfitsio.orig/configure	2016-05-04 09:33:42.223458798 -0400
-+++ cfitsio/configure	2016-05-04 09:34:05.530107491 -0400
-@@ -1982,7 +1982,7 @@
-       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "failed to load site script $ac_site_file
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-   fi
- done
- 
-@@ -2123,7 +2123,7 @@
- $as_echo "$ac_cv_build" >&6; }
- case $ac_cv_build in
- *-*-*) ;;
--*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
- esac
- build=$ac_cv_build
- ac_save_IFS=$IFS; IFS='-'
-@@ -2156,7 +2156,7 @@
- $as_echo "$ac_cv_host" >&6; }
- case $ac_cv_host in
- *-*-*) ;;
--*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
- esac
- host=$ac_cv_host
- ac_save_IFS=$IFS; IFS='-'
-@@ -2189,7 +2189,7 @@
- $as_echo "$ac_cv_target" >&6; }
- case $ac_cv_target in
- *-*-*) ;;
--*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
-+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
- esac
- target=$ac_cv_target
- ac_save_IFS=$IFS; IFS='-'
-@@ -3573,7 +3573,7 @@
- 	EXT="dec"
- 	;;
-     *)
--	echo "cfitsio: == Don't know what do do with $host"
-+	echo "cfitsio: == X Don't know what do do with $host"
- 	;;
- esac
- 
-@@ -3927,7 +3927,7 @@
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "no acceptable C compiler found in \$PATH
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
- 
- # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -5876,7 +5876,7 @@
-   case $ac_config_target in
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- 
--  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
-   esac
- done
- 
-@@ -6084,7 +6084,7 @@
-   esac
-   case $ac_mode$ac_tag in
-   :[FHL]*:*);;
--  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
-   :[FH]-) ac_tag=-:-;;
-   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-   esac
-@@ -6112,7 +6112,7 @@
- 	   [\\/$]*) false;;
- 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- 	   esac ||
--	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
-       esac
-       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-       as_fn_append ac_file_inputs " '$ac_f'"
-@@ -6139,7 +6139,7 @@
- 
-     case $ac_tag in
-     *:-:* | *:-) cat >"$ac_tmp/stdin" \
--      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
-     esac
-     ;;
-   esac
-@@ -7034,7 +7034,7 @@
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-     "cfitsio.pc") CONFIG_FILES="$CONFIG_FILES cfitsio.pc" ;;
- 
--  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
-   esac
- done
- 
-@@ -7242,7 +7242,7 @@
-   esac
-   case $ac_mode$ac_tag in
-   :[FHL]*:*);;
--  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
-   :[FH]-) ac_tag=-:-;;
-   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-   esac
-@@ -7270,7 +7270,7 @@
- 	   [\\/$]*) false;;
- 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- 	   esac ||
--	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
-       esac
-       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-       as_fn_append ac_file_inputs " '$ac_f'"
-@@ -7297,7 +7297,7 @@
- 
-     case $ac_tag in
-     *:-:* | *:-) cat >"$ac_tmp/stdin" \
--      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
-     esac
-     ;;
-   esac
 diff -ur cfitsio.orig/configure.in cfitsio/configure.in
---- cfitsio.orig/configure.in	2016-05-04 09:33:42.238458572 -0400
-+++ cfitsio/configure.in	2016-05-04 09:34:05.531107476 -0400
-@@ -154,7 +154,7 @@
- 	EXT="dec"
- 	;;
-     *)
--	echo "cfitsio: == Don't know what do do with $host"
-+	echo "cfitsio: == X Don't know what do do with $host"
- 	;;
- esac
- 
+--- 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: