Mercurial > mxe-octave

comparison src/of-netcdf-1-cross-fixes.patch @ 3901:5f92c505c86a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-netcdf: update patch for native compile * src/of-netcdf-1-cross-fixes.patch: update
author John Donoghue <john.donoghue@ieee.org>
date Mon, 13 Apr 2015 21:36:27 -0400
parents abf9c5216a21
children
comparison
equal deleted inserted replaced
3900:b68c2c052a28 3901:5f92c505c86a
1 diff -ur netcdf.orig/src/configure netcdf/src/configure 1 diff -ur netcdf.orig/src/configure netcdf/src/configure
2 --- netcdf.orig/src/configure 2015-04-12 18:55:55.602652298 -0400 2 --- netcdf.orig/src/configure 2015-04-13 21:29:33.000000000 -0400
3 +++ netcdf/src/configure 2015-04-12 18:56:10.946652868 -0400 3 +++ netcdf/src/configure 2015-04-13 21:31:02.000000000 -0400
4 @@ -601,6 +601,7 @@ 4 @@ -601,6 +601,7 @@
5 mpath 5 mpath
6 subver 6 subver
7 ver 7 ver
8 +OCTAVE_CONFIG 8 +OCTAVE_CONFIG
98 +$as_echo_n "checking for SHLEXT in octave-config... " >&6; } 98 +$as_echo_n "checking for SHLEXT in octave-config... " >&6; }
99 +SHLEXT=`$OCTAVE_CONFIG -p SHLEXT` 99 +SHLEXT=`$OCTAVE_CONFIG -p SHLEXT`
100 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHLEXT" >&5 100 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHLEXT" >&5
101 $as_echo "$SHLEXT" >&6; } 101 $as_echo "$SHLEXT" >&6; }
102 102
103 @@ -3058,11 +3101,105 @@ 103 @@ -3020,8 +3063,9 @@
104 104 esac
105 105
106 if test -z "$NC_CONFIG"; then 106
107 -# Extract the first word of "nc-config", so it can be a program name with args.
108 -set dummy nc-config; ac_word=$2
107 +if test -n "$ac_tool_prefix"; then 109 +if test -n "$ac_tool_prefix"; then
108 + # Extract the first word of "${ac_tool_prefix}nc-config", so it can be a program name with args. 110 + # Extract the first word of "${ac_tool_prefix}nc-config", so it can be a program name with args.
109 +set dummy ${ac_tool_prefix}nc-config; ac_word=$2 111 +set dummy ${ac_tool_prefix}nc-config; ac_word=$2
110 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 112 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
111 +$as_echo_n "checking for $ac_word... " >&6; } 113 $as_echo_n "checking for $ac_word... " >&6; }
112 +if ${ac_cv_prog_NC_CONFIG+:} false; then : 114 if ${ac_cv_prog_NC_CONFIG+:} false; then :
113 + $as_echo_n "(cached) " >&6 115 @@ -3037,7 +3081,7 @@
114 +else 116 test -z "$as_dir" && as_dir=.
115 + if test -n "$NC_CONFIG"; then 117 for ac_exec_ext in '' $ac_executable_extensions; do
116 + ac_cv_prog_NC_CONFIG="$NC_CONFIG" # Let the user override the test. 118 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
117 +else 119 - ac_cv_prog_NC_CONFIG="nc-config"
118 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
119 +for as_dir in $PATH
120 +do
121 + IFS=$as_save_IFS
122 + test -z "$as_dir" && as_dir=.
123 + for ac_exec_ext in '' $ac_executable_extensions; do
124 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
125 + ac_cv_prog_NC_CONFIG="${ac_tool_prefix}nc-config" 120 + ac_cv_prog_NC_CONFIG="${ac_tool_prefix}nc-config"
126 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 121 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
127 + break 2 122 break 2
128 + fi 123 fi
129 +done 124 @@ -3057,12 +3101,66 @@
130 + done 125 fi
131 +IFS=$as_save_IFS 126
132 + 127
133 +fi
134 +fi
135 +NC_CONFIG=$ac_cv_prog_NC_CONFIG
136 +if test -n "$NC_CONFIG"; then
137 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NC_CONFIG" >&5
138 +$as_echo "$NC_CONFIG" >&6; }
139 +else
140 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
141 +$as_echo "no" >&6; }
142 +fi
143 +
144 +
145 +fi 128 +fi
146 +if test -z "$ac_cv_prog_NC_CONFIG"; then 129 +if test -z "$ac_cv_prog_NC_CONFIG"; then
147 + ac_ct_NC_CONFIG=$NC_CONFIG 130 + ac_ct_NC_CONFIG=$NC_CONFIG
148 + # Extract the first word of "nc-config", so it can be a program name with args. 131 + # Extract the first word of "nc-config", so it can be a program name with args.
149 +set dummy nc-config; ac_word=$2 132 +set dummy nc-config; ac_word=$2
194 + fi 177 + fi
195 +else 178 +else
196 + NC_CONFIG="$ac_cv_prog_NC_CONFIG" 179 + NC_CONFIG="$ac_cv_prog_NC_CONFIG"
197 +fi 180 +fi
198 + 181 +
199 +fi 182 if test -z "$NC_CONFIG"; then
200 +if test -z "$NC_CONFIG"; then
201 as_fn_error 1 "nc-config not found" "$LINENO" 5; 183 as_fn_error 1 "nc-config not found" "$LINENO" 5;
202 fi 184 fi
203 185
204 -NETCDF_LIBS="$NETCDF_LIBS `nc-config --libs`" 186 -NETCDF_LIBS="$NETCDF_LIBS `nc-config --libs`"
205 -NETCDF_CFLAGS="$NETCDF_CFLAGS `nc-config --cflags`" 187 -NETCDF_CFLAGS="$NETCDF_CFLAGS `nc-config --cflags`"
206 +NETCDF_LIBS="$NETCDF_LIBS `$NC_CONFIG --libs`" 188 +NETCDF_LIBS="$NETCDF_LIBS `$NC_CONFIG --libs`"
207 +NETCDF_CFLAGS="$NETCDF_CFLAGS `$NC_CONFIG --cflags`" 189 +NETCDF_CFLAGS="$NETCDF_CFLAGS `$NC_CONFIG --cflags`"
208 190
209 191
210 CONFIGURE_OUTPUTS="Makeconf" 192 CONFIGURE_OUTPUTS="Makeconf"
211 @@ -3082,8 +3219,9 @@ 193 @@ -3082,8 +3180,9 @@
212 headers: $includedir 194 headers: $includedir
213 195
214 octave-forge is configured with 196 octave-forge is configured with
215 - octave: $OCTAVE (version $OCTAVE_VERSION) 197 - octave: $OCTAVE (version $OCTAVE_VERSION)
216 - mkoctfile: $MKOCTFILE for Octave $subver 198 - mkoctfile: $MKOCTFILE for Octave $subver
219 + octave-config: $OCTAVE_CONFIG for Octave $subver 201 + octave-config: $OCTAVE_CONFIG for Octave $subver
220 netCDF compiler flags: $NETCDF_CFLAGS 202 netCDF compiler flags: $NETCDF_CFLAGS
221 netCDF libraries: $NETCDF_LIBS" 203 netCDF libraries: $NETCDF_LIBS"
222 ac_config_files="$ac_config_files $CONFIGURE_OUTPUTS" 204 ac_config_files="$ac_config_files $CONFIGURE_OUTPUTS"
223 diff -ur netcdf.orig/src/configure.base netcdf/src/configure.base 205 diff -ur netcdf.orig/src/configure.base netcdf/src/configure.base
224 --- netcdf.orig/src/configure.base 2015-04-12 18:55:55.602652298 -0400 206 --- netcdf.orig/src/configure.base 2015-04-13 21:29:33.000000000 -0400
225 +++ netcdf/src/configure.base 2015-04-12 18:56:10.946652868 -0400 207 +++ netcdf/src/configure.base 2015-04-13 21:30:41.000000000 -0400
226 @@ -50,6 +50,9 @@ 208 @@ -50,6 +50,9 @@
227 AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile) 209 AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile)
228 test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path]) 210 test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path])
229 211
230 +AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config) 212 +AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config)
262 -OCTAVE_EVAL(octave_config_info('SHLEXT'),SHLEXT) 244 -OCTAVE_EVAL(octave_config_info('SHLEXT'),SHLEXT)
263 +OCTAVE_CONFIG_EVAL(SHLEXT,SHLEXT) 245 +OCTAVE_CONFIG_EVAL(SHLEXT,SHLEXT)
264 246
265 AC_PROG_LN_S 247 AC_PROG_LN_S
266 248
267 @@ -312,11 +322,14 @@ 249 @@ -310,13 +320,14 @@
268 250
269 AC_CHECK_PROG(NC_CONFIG, nc-config, nc-config) 251 dnl checking for nc-config
252
253 -AC_CHECK_PROG(NC_CONFIG, nc-config, nc-config)
254 +dnl AC_CHECK_PROG(NC_CONFIG, nc-config, nc-config)
255 +AC_CHECK_TOOL(NC_CONFIG, nc-config, nc-config)
270 if test -z "$NC_CONFIG"; then 256 if test -z "$NC_CONFIG"; then
271 +AC_CHECK_TOOL(NC_CONFIG, nc-config, nc-config)
272 +fi
273 +if test -z "$NC_CONFIG"; then
274 AC_MSG_ERROR([nc-config not found], 1); 257 AC_MSG_ERROR([nc-config not found], 1);
275 fi 258 fi
276 259
277 -NETCDF_LIBS="$NETCDF_LIBS `nc-config --libs`" 260 -NETCDF_LIBS="$NETCDF_LIBS `nc-config --libs`"
278 -NETCDF_CFLAGS="$NETCDF_CFLAGS `nc-config --cflags`" 261 -NETCDF_CFLAGS="$NETCDF_CFLAGS `nc-config --cflags`"
279 +NETCDF_LIBS="$NETCDF_LIBS `$NC_CONFIG --libs`" 262 +NETCDF_LIBS="$NETCDF_LIBS `$NC_CONFIG --libs`"
280 +NETCDF_CFLAGS="$NETCDF_CFLAGS `$NC_CONFIG --cflags`" 263 +NETCDF_CFLAGS="$NETCDF_CFLAGS `$NC_CONFIG --cflags`"
281 264
282 265
283 CONFIGURE_OUTPUTS="Makeconf" 266 CONFIGURE_OUTPUTS="Makeconf"
284 @@ -336,7 +349,8 @@ 267 @@ -336,7 +347,8 @@
285 headers: $includedir 268 headers: $includedir
286 269
287 octave-forge is configured with 270 octave-forge is configured with
288 - octave: $OCTAVE (version $OCTAVE_VERSION) 271 - octave: $OCTAVE (version $OCTAVE_VERSION)
289 - mkoctfile: $MKOCTFILE for Octave $subver 272 - mkoctfile: $MKOCTFILE for Octave $subver
291 + mkoctfile: $MKOCTFILE for Octave $subver 274 + mkoctfile: $MKOCTFILE for Octave $subver
292 + octave-config: $OCTAVE_CONFIG for Octave $subver 275 + octave-config: $OCTAVE_CONFIG for Octave $subver
293 netCDF compiler flags: $NETCDF_CFLAGS 276 netCDF compiler flags: $NETCDF_CFLAGS
294 netCDF libraries: $NETCDF_LIBS" 277 netCDF libraries: $NETCDF_LIBS"
295 diff -ur netcdf.orig/src/Makeconf.in netcdf/src/Makeconf.in 278 diff -ur netcdf.orig/src/Makeconf.in netcdf/src/Makeconf.in
296 --- netcdf.orig/src/Makeconf.in 2015-04-12 18:55:55.602652298 -0400 279 --- netcdf.orig/src/Makeconf.in 2015-04-13 21:29:33.000000000 -0400
297 +++ netcdf/src/Makeconf.in 2015-04-12 18:58:26.890657913 -0400 280 +++ netcdf/src/Makeconf.in 2015-04-13 21:29:55.000000000 -0400
298 @@ -53,6 +53,8 @@ 281 @@ -53,6 +53,8 @@
299 OCTAVE_VERSION = @OCTAVE_VERSION@ 282 OCTAVE_VERSION = @OCTAVE_VERSION@
300 MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v 283 MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
301 SHLEXT = @SHLEXT@ 284 SHLEXT = @SHLEXT@
302 +NC_CONFIG = @NC_CONFIG@ 285 +NC_CONFIG = @NC_CONFIG@
303 +OCTAVE_CONFIG = @OCTAVE_CONFIG@ 286 +OCTAVE_CONFIG = @OCTAVE_CONFIG@
304 287
305 %.o: %.c ; $(MKOCTFILE) -c $< 288 %.o: %.c ; $(MKOCTFILE) -c $<
306 %.o: %.f ; $(MKOCTFILE) -c $< 289 %.o: %.f ; $(MKOCTFILE) -c $<
307 diff -ur netcdf.orig/src/Makefile netcdf/src/Makefile 290 diff -ur netcdf.orig/src/Makefile netcdf/src/Makefile
308 --- netcdf.orig/src/Makefile 2015-04-12 18:55:55.602652298 -0400 291 --- netcdf.orig/src/Makefile 2015-04-13 21:29:33.000000000 -0400
309 +++ netcdf/src/Makefile 2015-04-12 18:58:31.602658088 -0400 292 +++ netcdf/src/Makefile 2015-04-13 21:29:55.000000000 -0400
310 @@ -1,10 +1,13 @@ 293 @@ -1,10 +1,13 @@
311 -LIBS=$(shell nc-config --libs) 294 -LIBS=$(shell nc-config --libs)
312 -AWK=awk 295 -AWK=awk
313 -MKOCTFILE=mkoctfile 296 -MKOCTFILE=mkoctfile
314 -OCTAVE=octave 297 -OCTAVE=octave