Mercurial > mxe-octave

changeset 4142:de7c1c03561a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cfitsio: update to v3.390 * src/cfitsio.mk: update version, checksum * src/mingw-cfitsio-1-fixes.patch: update patch
author John Donoghue
date Mon, 23 May 2016 12:50:13 -0400
parents 3a3a0122cfde
children e9a40603c054
files src/cfitsio.mk src/mingw-cfitsio-1-fixes.patch
diffstat 2 files changed, 23 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/src/cfitsio.mk	Mon May 23 12:50:09 2016 -0400
+++ b/src/cfitsio.mk	Mon May 23 12:50:13 2016 -0400
@@ -3,8 +3,8 @@
 
 PKG             := cfitsio
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3370
-$(PKG)_CHECKSUM := 48bd6389dcff3228508eec70384f2cae3a88ff32
+$(PKG)_VERSION  := 3390
+$(PKG)_CHECKSUM := 818ee00793ae27dfc75752c2415d0a7230ad5066
 $(PKG)_SUBDIR   := $(PKG)
 $(PKG)_FILE     := $(PKG)$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/$($(PKG)_FILE)
--- a/src/mingw-cfitsio-1-fixes.patch	Mon May 23 12:50:09 2016 -0400
+++ b/src/mingw-cfitsio-1-fixes.patch	Mon May 23 12:50:13 2016 -0400
@@ -1,7 +1,7 @@
-diff -u cfitsio.orig/configure cfitsio/configure
---- cfitsio.orig/configure	2014-06-12 11:42:22.000000000 -0400
-+++ cfitsio/configure	2014-06-26 15:38:26.323327942 -0400
-@@ -1981,7 +1981,7 @@
+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
@@ -10,7 +10,7 @@
    fi
  done
  
-@@ -2122,7 +2122,7 @@
+@@ -2123,7 +2123,7 @@
  $as_echo "$ac_cv_build" >&6; }
  case $ac_cv_build in
  *-*-*) ;;
@@ -19,7 +19,7 @@
  esac
  build=$ac_cv_build
  ac_save_IFS=$IFS; IFS='-'
-@@ -2155,7 +2155,7 @@
+@@ -2156,7 +2156,7 @@
  $as_echo "$ac_cv_host" >&6; }
  case $ac_cv_host in
  *-*-*) ;;
@@ -28,7 +28,7 @@
  esac
  host=$ac_cv_host
  ac_save_IFS=$IFS; IFS='-'
-@@ -2188,7 +2188,7 @@
+@@ -2189,7 +2189,7 @@
  $as_echo "$ac_cv_target" >&6; }
  case $ac_cv_target in
  *-*-*) ;;
@@ -37,7 +37,7 @@
  esac
  target=$ac_cv_target
  ac_save_IFS=$IFS; IFS='-'
-@@ -3592,7 +3592,7 @@
+@@ -3573,7 +3573,7 @@
  	EXT="dec"
  	;;
      *)
@@ -46,7 +46,7 @@
  	;;
  esac
  
-@@ -3946,7 +3946,7 @@
+@@ -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
@@ -55,18 +55,7 @@
  
  # Provide some information about the compiler.
  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -4716,6 +4716,10 @@
- CFITSIO_SHLIB_SONAME=""
- lhea_shlib_cflags=
- case $EXT in
-+  mingw32)
-+    SHLIB_LD="$CC -shared"
-+    SHLIB_SUFFIX=".dll"
-+    ;;
-   cygwin)
-     SHLIB_LD="$CC -shared"
-     SHLIB_SUFFIX=".dll"
-@@ -5878,7 +5882,7 @@
+@@ -5876,7 +5876,7 @@
    case $ac_config_target in
      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
  
@@ -75,7 +64,7 @@
    esac
  done
  
-@@ -6086,7 +6090,7 @@
+@@ -6084,7 +6084,7 @@
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -84,7 +73,7 @@
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -6114,7 +6118,7 @@
+@@ -6112,7 +6112,7 @@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -93,7 +82,7 @@
        esac
        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
        as_fn_append ac_file_inputs " '$ac_f'"
-@@ -6141,7 +6145,7 @@
+@@ -6139,7 +6139,7 @@
  
      case $ac_tag in
      *:-:* | *:-) cat >"$ac_tmp/stdin" \
@@ -102,7 +91,7 @@
      esac
      ;;
    esac
-@@ -7036,7 +7040,7 @@
+@@ -7034,7 +7034,7 @@
      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
      "cfitsio.pc") CONFIG_FILES="$CONFIG_FILES cfitsio.pc" ;;
  
@@ -111,7 +100,7 @@
    esac
  done
  
-@@ -7244,7 +7248,7 @@
+@@ -7242,7 +7242,7 @@
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -120,7 +109,7 @@
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -7272,7 +7276,7 @@
+@@ -7270,7 +7270,7 @@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -129,7 +118,7 @@
        esac
        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
        as_fn_append ac_file_inputs " '$ac_f'"
-@@ -7299,7 +7303,7 @@
+@@ -7297,7 +7297,7 @@
  
      case $ac_tag in
      *:-:* | *:-) cat >"$ac_tmp/stdin" \
@@ -138,10 +127,10 @@
      esac
      ;;
    esac
-diff -u cfitsio.orig/configure.in cfitsio/configure.in
---- cfitsio.orig/configure.in	2014-06-12 11:42:38.000000000 -0400
-+++ cfitsio/configure.in	2014-06-26 15:38:26.324327963 -0400
-@@ -159,7 +159,7 @@
+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"
  	;;
      *)
@@ -150,14 +139,3 @@
  	;;
  esac
  
-@@ -379,6 +379,10 @@
- CFITSIO_SHLIB_SONAME=""
- lhea_shlib_cflags=
- case $EXT in
-+  mingw32)
-+    SHLIB_LD="$CC -shared"
-+    SHLIB_SUFFIX=".dll"
-+    ;;
-   cygwin)
-     SHLIB_LD="$CC -shared"
-     SHLIB_SUFFIX=".dll"