Mercurial > mxe-octave

comparison src/mingw-cfitsio-1-fixes.patch @ 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 26e3a441d573
children 97fc509bb1df
comparison
equal deleted inserted replaced
4141:3a3a0122cfde 4142:de7c1c03561a
1 diff -u cfitsio.orig/configure cfitsio/configure 1 diff -ur cfitsio.orig/configure cfitsio/configure
2 --- cfitsio.orig/configure 2014-06-12 11:42:22.000000000 -0400 2 --- cfitsio.orig/configure 2016-05-04 09:33:42.223458798 -0400
3 +++ cfitsio/configure 2014-06-26 15:38:26.323327942 -0400 3 +++ cfitsio/configure 2016-05-04 09:34:05.530107491 -0400
4 @@ -1981,7 +1981,7 @@ 4 @@ -1982,7 +1982,7 @@
5 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 5 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 6 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7 as_fn_error $? "failed to load site script $ac_site_file 7 as_fn_error $? "failed to load site script $ac_site_file
8 -See \`config.log' for more details" "$LINENO" 5; } 8 -See \`config.log' for more details" "$LINENO" 5; }
9 +See \`config.log' for more details" "$LINENO" 5 ; } 9 +See \`config.log' for more details" "$LINENO" 5 ; }
10 fi 10 fi
11 done 11 done
12 12
13 @@ -2122,7 +2122,7 @@ 13 @@ -2123,7 +2123,7 @@
14 $as_echo "$ac_cv_build" >&6; } 14 $as_echo "$ac_cv_build" >&6; }
15 case $ac_cv_build in 15 case $ac_cv_build in
16 *-*-*) ;; 16 *-*-*) ;;
17 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 17 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
18 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 18 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
19 esac 19 esac
20 build=$ac_cv_build 20 build=$ac_cv_build
21 ac_save_IFS=$IFS; IFS='-' 21 ac_save_IFS=$IFS; IFS='-'
22 @@ -2155,7 +2155,7 @@ 22 @@ -2156,7 +2156,7 @@
23 $as_echo "$ac_cv_host" >&6; } 23 $as_echo "$ac_cv_host" >&6; }
24 case $ac_cv_host in 24 case $ac_cv_host in
25 *-*-*) ;; 25 *-*-*) ;;
26 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 26 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
27 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 27 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
28 esac 28 esac
29 host=$ac_cv_host 29 host=$ac_cv_host
30 ac_save_IFS=$IFS; IFS='-' 30 ac_save_IFS=$IFS; IFS='-'
31 @@ -2188,7 +2188,7 @@ 31 @@ -2189,7 +2189,7 @@
32 $as_echo "$ac_cv_target" >&6; } 32 $as_echo "$ac_cv_target" >&6; }
33 case $ac_cv_target in 33 case $ac_cv_target in
34 *-*-*) ;; 34 *-*-*) ;;
35 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 35 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
36 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 36 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
37 esac 37 esac
38 target=$ac_cv_target 38 target=$ac_cv_target
39 ac_save_IFS=$IFS; IFS='-' 39 ac_save_IFS=$IFS; IFS='-'
40 @@ -3592,7 +3592,7 @@ 40 @@ -3573,7 +3573,7 @@
41 EXT="dec" 41 EXT="dec"
42 ;; 42 ;;
43 *) 43 *)
44 - echo "cfitsio: == Don't know what do do with $host" 44 - echo "cfitsio: == Don't know what do do with $host"
45 + echo "cfitsio: == X Don't know what do do with $host" 45 + echo "cfitsio: == X Don't know what do do with $host"
46 ;; 46 ;;
47 esac 47 esac
48 48
49 @@ -3946,7 +3946,7 @@ 49 @@ -3927,7 +3927,7 @@
50 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 50 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
51 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 51 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
52 as_fn_error $? "no acceptable C compiler found in \$PATH 52 as_fn_error $? "no acceptable C compiler found in \$PATH
53 -See \`config.log' for more details" "$LINENO" 5; } 53 -See \`config.log' for more details" "$LINENO" 5; }
54 +See \`config.log' for more details" "$LINENO" 5 ; } 54 +See \`config.log' for more details" "$LINENO" 5 ; }
55 55
56 # Provide some information about the compiler. 56 # Provide some information about the compiler.
57 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 57 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
58 @@ -4716,6 +4716,10 @@ 58 @@ -5876,7 +5876,7 @@
59 CFITSIO_SHLIB_SONAME=""
60 lhea_shlib_cflags=
61 case $EXT in
62 + mingw32)
63 + SHLIB_LD="$CC -shared"
64 + SHLIB_SUFFIX=".dll"
65 + ;;
66 cygwin)
67 SHLIB_LD="$CC -shared"
68 SHLIB_SUFFIX=".dll"
69 @@ -5878,7 +5882,7 @@
70 case $ac_config_target in 59 case $ac_config_target in
71 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; 60 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
72 61
73 - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 62 - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
74 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 63 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
75 esac 64 esac
76 done 65 done
77 66
78 @@ -6086,7 +6090,7 @@ 67 @@ -6084,7 +6084,7 @@
79 esac 68 esac
80 case $ac_mode$ac_tag in 69 case $ac_mode$ac_tag in
81 :[FHL]*:*);; 70 :[FHL]*:*);;
82 - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 71 - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
83 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 72 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
84 :[FH]-) ac_tag=-:-;; 73 :[FH]-) ac_tag=-:-;;
85 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 74 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
86 esac 75 esac
87 @@ -6114,7 +6118,7 @@ 76 @@ -6112,7 +6112,7 @@
88 [\\/$]*) false;; 77 [\\/$]*) false;;
89 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 78 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
90 esac || 79 esac ||
91 - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 80 - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
92 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 81 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
93 esac 82 esac
94 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 83 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
95 as_fn_append ac_file_inputs " '$ac_f'" 84 as_fn_append ac_file_inputs " '$ac_f'"
96 @@ -6141,7 +6145,7 @@ 85 @@ -6139,7 +6139,7 @@
97 86
98 case $ac_tag in 87 case $ac_tag in
99 *:-:* | *:-) cat >"$ac_tmp/stdin" \ 88 *:-:* | *:-) cat >"$ac_tmp/stdin" \
100 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 89 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
101 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 90 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
102 esac 91 esac
103 ;; 92 ;;
104 esac 93 esac
105 @@ -7036,7 +7040,7 @@ 94 @@ -7034,7 +7034,7 @@
106 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; 95 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
107 "cfitsio.pc") CONFIG_FILES="$CONFIG_FILES cfitsio.pc" ;; 96 "cfitsio.pc") CONFIG_FILES="$CONFIG_FILES cfitsio.pc" ;;
108 97
109 - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 98 - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
110 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 99 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
111 esac 100 esac
112 done 101 done
113 102
114 @@ -7244,7 +7248,7 @@ 103 @@ -7242,7 +7242,7 @@
115 esac 104 esac
116 case $ac_mode$ac_tag in 105 case $ac_mode$ac_tag in
117 :[FHL]*:*);; 106 :[FHL]*:*);;
118 - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 107 - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
119 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 108 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
120 :[FH]-) ac_tag=-:-;; 109 :[FH]-) ac_tag=-:-;;
121 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 110 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
122 esac 111 esac
123 @@ -7272,7 +7276,7 @@ 112 @@ -7270,7 +7270,7 @@
124 [\\/$]*) false;; 113 [\\/$]*) false;;
125 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 114 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
126 esac || 115 esac ||
127 - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 116 - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
128 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 117 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
129 esac 118 esac
130 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 119 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
131 as_fn_append ac_file_inputs " '$ac_f'" 120 as_fn_append ac_file_inputs " '$ac_f'"
132 @@ -7299,7 +7303,7 @@ 121 @@ -7297,7 +7297,7 @@
133 122
134 case $ac_tag in 123 case $ac_tag in
135 *:-:* | *:-) cat >"$ac_tmp/stdin" \ 124 *:-:* | *:-) cat >"$ac_tmp/stdin" \
136 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 125 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
137 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 126 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
138 esac 127 esac
139 ;; 128 ;;
140 esac 129 esac
141 diff -u cfitsio.orig/configure.in cfitsio/configure.in 130 diff -ur cfitsio.orig/configure.in cfitsio/configure.in
142 --- cfitsio.orig/configure.in 2014-06-12 11:42:38.000000000 -0400 131 --- cfitsio.orig/configure.in 2016-05-04 09:33:42.238458572 -0400
143 +++ cfitsio/configure.in 2014-06-26 15:38:26.324327963 -0400 132 +++ cfitsio/configure.in 2016-05-04 09:34:05.531107476 -0400
144 @@ -159,7 +159,7 @@ 133 @@ -154,7 +154,7 @@
145 EXT="dec" 134 EXT="dec"
146 ;; 135 ;;
147 *) 136 *)
148 - echo "cfitsio: == Don't know what do do with $host" 137 - echo "cfitsio: == Don't know what do do with $host"
149 + echo "cfitsio: == X Don't know what do do with $host" 138 + echo "cfitsio: == X Don't know what do do with $host"
150 ;; 139 ;;
151 esac 140 esac
152 141
153 @@ -379,6 +379,10 @@
154 CFITSIO_SHLIB_SONAME=""
155 lhea_shlib_cflags=
156 case $EXT in
157 + mingw32)
158 + SHLIB_LD="$CC -shared"
159 + SHLIB_SUFFIX=".dll"
160 + ;;
161 cygwin)
162 SHLIB_LD="$CC -shared"
163 SHLIB_SUFFIX=".dll"