Changeset 2278


Ignore:
Timestamp:
Jun 15, 2011 8:00:48 AM (8 years ago)
Author:
stefan
Message:

merge chgsets 2235,2238,2258-2262,2273 from trunk

Location:
stable/0.6
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6

  • stable/0.6/coin.m4

    r2224 r2278  
    635635        coin_opt_cxxflags="-O3"
    636636        coin_add_cxxflags="-pipe"
    637         coin_dbg_cxxflags="-g"
     637        coin_dbg_cxxflags="-g -O0"
    638638        coin_warn_cxxflags="-Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas"
    639639        case $build in
     
    10301030        coin_opt_cflags="-O3"
    10311031        coin_add_cflags="-pipe"
    1032         coin_dbg_cflags="-g"
     1032        coin_dbg_cflags="-g -O0"
    10331033        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas"
    10341034        case $build in
     
    12561256    coin_opt_fflags="-O3"
    12571257    coin_add_fflags="-pipe"
    1258     coin_dbg_fflags="-g"
     1258    coin_dbg_fflags="-g -O0"
    12591259    case $enable_doscompile in
    12601260      mingw)
     
    22702270  fi
    22712271
     2272  AC_MSG_NOTICE([In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting])
    22722273  if test x$coin_projectdir = xyes; then
    22732274    AC_MSG_NOTICE([Configuration of $PACKAGE_NAME successful])
     
    42204221m4_toupper($1_DATA_INSTALLED)=
    42214222
    4222 # initial list of dependencies is "$2", but we need to filter out version number specifications (= x, <= x, >= x)
    4223 projtoprocess="m4_bpatsubsts([$2], [<?>?=[      ]*[^    ]+])"
     4223# initial list of dependencies is "$2", but we need to filter out version number specifications (= x, <= x, >= x, != x)
     4224projtoprocess="m4_bpatsubsts([$2], [<?>?!?=[    ]*[^    ]+])"
    42244225
    42254226# we first expand the list of projects to process by adding all dependencies just behind the project which depends on it
     
    42584259      # add projrequires to the front of the list of projects that have to be processed next
    42594260      # at the same time, remove $proj from this list
    4260       projtoprocess=${projtoprocess/$proj/$projrequires}
     4261      projtoprocess=[`echo $projtoprocess | sed -e "s/$proj/$projrequires/"`]
    42614262
    42624263      # read DATA from $pcfile, if _DATA is still empty
     
    43284329
    43294330    # set projcflags and projlibs variables by running $pcfilemod
     4331    # under mingw, the current IFS seem to make the : in the paths of the gfortran libs go away, so we temporarily set IFS back to its default
    43304332    projcflags=
    43314333    projlibs=
     4334    IFS="$save_IFS"
    43324335    eval `sh -c "$pcfilemod"`
     4336    IFS=":"
    43334337
    43344338    # add CYGPATH_W cludge into include flags and set CFLAGS variable
     
    43734377
    43744378    # set projcflags and projlibs variables by running $pcfilemod
     4379    # under mingw, the current IFS seem to make the : in the paths of the gfortran libs go away, so we temporarily set IFS back to its default
    43754380    projcflags=
    43764381    projlibs=
     4382    IFS="$save_IFS"
    43774383    eval `sh -c "$pcfilemod"`
     4384    IFS=":"
    43784385
    43794386    # add CYGPATH_W cludge into include flags and set CFLAGS variable
     
    44014408  # for the LIBS, we replace everything of the form "/somepath/name.lib" by "`$(CYGPATH_W) /somepath/`name.lib | sed -e s|\|/|g" (where we have to use excessive many \ to get the \ into the command line for cl),
    44024409  # for the LIBS_INSTALLED, we replace everything of the form "/somepath/" by "`$(CYGPATH_W) /somepath/`",
    4403   #    everything of the form "-Lpath" by "/libpath:`$(CYGPATH_W) path`, and
    4404   #    everything of the form "-lname" by "libname.lib"
     4410  #    everything of the form "-lname" by "libname.lib", and
     4411  #    everything of the form "-Lpath" by "-libpath:`$(CYGPATH_W) path`
    44054412  if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
    44064413  then
    44074414    m4_toupper($1_LIBS)=`echo " $m4_toupper($1_LIBS) " | [sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g']`
    4408     m4_toupper($1_LIBS_INSTALLED)=`echo " $m4_toupper($1_LIBS_INSTALLED)" | [sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g']`
     4415    m4_toupper($1_LIBS_INSTALLED)=`echo " $m4_toupper($1_LIBS_INSTALLED)" | [sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g' -e 's/ -L\([^ ]*\)/ -libpath:\`$(CYGPATH_W) \1\`/g']`
    44094416  fi
    44104417
  • stable/0.6/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.