Changeset 1760 for stable/1.14
- Timestamp:
- Jul 2, 2011 9:15:55 AM (10 years ago)
- Location:
- stable/1.14
- Files:
-
- 4 edited
-
. (modified) (1 prop)
-
Clp/configure (modified) (10 diffs)
-
Clp/src/ClpDynamicMatrix.hpp (modified) (1 diff)
-
configure (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
stable/1.14
-
stable/1.14/Clp/configure
r1753 r1760 20940 20940 if test -n "$PKG_CONFIG" ; then 20941 20941 if $PKG_CONFIG --exists "coinutils"; then 20942 COINUTILS_VERSIONS= "`$PKG_CONFIG --modversion "coinutils" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"20942 COINUTILS_VERSIONS=`$PKG_CONFIG --modversion "coinutils" 2>/dev/null | tr '\n' ' '` 20943 20943 cflags=`$PKG_CONFIG --cflags "coinutils" 2>/dev/null` 20944 20944 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 21456 21456 if test -n "$PKG_CONFIG" ; then 21457 21457 if $PKG_CONFIG --exists "osi"; then 21458 OSI_VERSIONS= "`$PKG_CONFIG --modversion "osi" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"21458 OSI_VERSIONS=`$PKG_CONFIG --modversion "osi" 2>/dev/null | tr '\n' ' '` 21459 21459 cflags=`$PKG_CONFIG --cflags "osi" 2>/dev/null` 21460 21460 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 21956 21956 if test -n "$PKG_CONFIG" ; then 21957 21957 if $PKG_CONFIG --exists "osi-unittests"; then 21958 OSITESTS_VERSIONS= "`$PKG_CONFIG --modversion "osi-unittests" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"21958 OSITESTS_VERSIONS=`$PKG_CONFIG --modversion "osi-unittests" 2>/dev/null | tr '\n' ' '` 21959 21959 cflags=`$PKG_CONFIG --cflags "osi-unittests" 2>/dev/null` 21960 21960 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 22437 22437 if test -n "$PKG_CONFIG" ; then 22438 22438 if $PKG_CONFIG --exists "coindatasample"; then 22439 SAMPLE_VERSIONS= "`$PKG_CONFIG --modversion "coindatasample" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"22439 SAMPLE_VERSIONS=`$PKG_CONFIG --modversion "coindatasample" 2>/dev/null | tr '\n' ' '` 22440 22440 cflags=`$PKG_CONFIG --cflags "coindatasample" 2>/dev/null` 22441 22441 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 22918 22918 if test -n "$PKG_CONFIG" ; then 22919 22919 if $PKG_CONFIG --exists "coindatanetlib"; then 22920 NETLIB_VERSIONS= "`$PKG_CONFIG --modversion "coindatanetlib" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"22920 NETLIB_VERSIONS=`$PKG_CONFIG --modversion "coindatanetlib" 2>/dev/null | tr '\n' ' '` 22921 22921 cflags=`$PKG_CONFIG --cflags "coindatanetlib" 2>/dev/null` 22922 22922 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 23800 23800 if test -n "$PKG_CONFIG" ; then 23801 23801 if $PKG_CONFIG --exists "coinglpk"; then 23802 GLPK_VERSIONS= "`$PKG_CONFIG --modversion "coinglpk" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"23802 GLPK_VERSIONS=`$PKG_CONFIG --modversion "coinglpk" 2>/dev/null | tr '\n' ' '` 23803 23803 cflags=`$PKG_CONFIG --cflags "coinglpk" 2>/dev/null` 23804 23804 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 24335 24335 if test -n "$PKG_CONFIG" ; then 24336 24336 if $PKG_CONFIG --exists "coinmumps"; then 24337 MUMPS_VERSIONS= "`$PKG_CONFIG --modversion "coinmumps" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"24337 MUMPS_VERSIONS=`$PKG_CONFIG --modversion "coinmumps" 2>/dev/null | tr '\n' ' '` 24338 24338 cflags=`$PKG_CONFIG --cflags "coinmumps" 2>/dev/null` 24339 24339 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 29293 29293 if test -n "$PKG_CONFIG" ; then 29294 29294 if $PKG_CONFIG --exists "coinblas"; then 29295 BLAS_VERSIONS= "`$PKG_CONFIG --modversion "coinblas" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"29295 BLAS_VERSIONS=`$PKG_CONFIG --modversion "coinblas" 2>/dev/null | tr '\n' ' '` 29296 29296 cflags=`$PKG_CONFIG --cflags "coinblas" 2>/dev/null` 29297 29297 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 31436 31436 31437 31437 fi 31438 31439 # On AIX, the default sed cannot deal with somewhat long sed commands executed by config.status.31440 # So we reduce the hardcoded number of commands given to sed from 48 to 5 in config.status, hoping this will suffice.31441 31442 31438 31443 31439 cat >confcache <<\_ACEOF … … 33213 33209 33214 33210 33215 case $build in33216 *-aix*)33217 { echo "$as_me:$LINENO: patching config.status to reduce ac_max_sed_lines to 5" >&533218 echo "$as_me: patching config.status to reduce ac_max_sed_lines to 5" >&6;}33219 sed -e 's/ac_max_sed_lines=48/ac_max_sed_lines=5/g' config.status > config.status.tmp33220 mv config.status.tmp config.status33221 ;;33222 esac33223 33224 33225 33211 # configure is writing to config.log, and then calls config.status. 33226 33212 # config.status does its own redirection, appending to config.log. -
stable/1.14/Clp/src/ClpDynamicMatrix.hpp
r1753 r1760 136 136 int numberColumns, const int * starts, 137 137 const double * lower, const double * upper, 138 const int* startColumn, const int * row,138 const CoinBigIndex * startColumn, const int * row, 139 139 const double * element, const double * cost, 140 140 const double * columnLower = NULL, const double * columnUpper = NULL, -
stable/1.14/configure
r1753 r1760 22423 22423 fi 22424 22424 22425 # On AIX, the default sed cannot deal with somewhat long sed commands executed by config.status.22426 # So we reduce the hardcoded number of commands given to sed from 48 to 5 in config.status, hoping this will suffice.22427 22428 22429 22425 cat >confcache <<\_ACEOF 22430 22426 # This file is a shell script that caches the results of configure … … 23689 23685 23690 23686 23691 case $build in23692 *-aix*)23693 { echo "$as_me:$LINENO: patching config.status to reduce ac_max_sed_lines to 5" >&523694 echo "$as_me: patching config.status to reduce ac_max_sed_lines to 5" >&6;}23695 sed -e 's/ac_max_sed_lines=48/ac_max_sed_lines=5/g' config.status > config.status.tmp23696 mv config.status.tmp config.status23697 ;;23698 esac23699 23700 23701 23687 # configure is writing to config.log, and then calls config.status. 23702 23688 # config.status does its own redirection, appending to config.log.
Note: See TracChangeset
for help on using the changeset viewer.
