Mercurial > mxe-octave

comparison src/of-octcdf-1-cross-fixes.patch @ 4059:b5a28d770997

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-communications, of-octcdf: update patch for default repo of octave * src/of-communications-1-fixes.patch: update patch * src/of-octcdf-1-cross-fixes.patch: update patch
author John Donoghue
date Wed, 25 Nov 2015 12:29:03 -0500
parents 3d16df45776b
children
comparison
equal deleted inserted replaced
4058:c7e31c07c915 4059:b5a28d770997
1104 +NC_CONFIG = @NC_CONFIG@ 1104 +NC_CONFIG = @NC_CONFIG@
1105 +OCTAVE_CONFIG = @OCTAVE_CONFIG@ 1105 +OCTAVE_CONFIG = @OCTAVE_CONFIG@
1106 1106
1107 HAVE_NETCDF=@HAVE_NETCDF@ 1107 HAVE_NETCDF=@HAVE_NETCDF@
1108 OCTCDF_LIBS=@OCTCDF_LIBS@ 1108 OCTCDF_LIBS=@OCTCDF_LIBS@
1109 diff -ur octcdf.orig/src/configure octcdf/src/configure
1110 --- octcdf.orig/src/configure 2015-11-25 08:22:54.216927907 -0500
1111 +++ octcdf/src/configure 2015-11-25 08:43:20.679996250 -0500
1112 @@ -2887,6 +2887,11 @@
1113
1114
1115
1116 +oct_ver=`echo $OCTAVE_VERSION | sed -e "s/\.//" -e "s/\..*$//"`
1117 +if test "$oct_ver" -ge "40" ; then
1118 + OCTCDF_CFLAGS="$OCTCDF_CFLAGS -DOV_REP_TYPE=octave_base_value"
1119 +fi
1120 +
1121 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANONICAL_HOST_TYPE in octave-config" >&5
1122 $as_echo_n "checking for CANONICAL_HOST_TYPE in octave-config... " >&6; }
1123 canonical_host_type=`$OCTAVE_CONFIG -p CANONICAL_HOST_TYPE`
1124 diff -ur octcdf.orig/src/configure.base octcdf/src/configure.base
1125 --- octcdf.orig/src/configure.base 2015-11-25 08:22:54.215927888 -0500
1126 +++ octcdf/src/configure.base 2015-11-25 08:43:05.311695338 -0500
1127 @@ -281,6 +281,11 @@
1128 AC_CHECK_PROG(OCTAVE,octave,octave)
1129 OCTAVE_CONFIG_EVAL(VERSION,OCTAVE_VERSION)
1130
1131 +oct_ver=`echo $OCTAVE_VERSION | sed -e "s/\.//" -e "s/\..*$//"`
1132 +if test "$ocvt_ver" -ge "40" ; then
1133 + OCTCDF_CFLAGS="$OCTCDF_CFLAGS -DOV_REP_TYPE=octave_base_value"
1134 +fi
1135 +
1136 dnl grab canonical host type so we can write system specific install stuff
1137 OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type)
1138