Changeset 2484


Ignore:
Timestamp:
Jan 20, 2012 4:12:26 AM (9 years ago)
Author:
stefan
Message:

add missing compile of mc68i

Location:
ThirdParty/HSL/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/HSL/trunk/Makefile.am

    r2469 r2484  
    3939
    4040if COIN_HAS_HSL_MC68
    41   libcoinhsl_la_SOURCES += hsl_mc68/C/hsl_mc68i_ciface.f90
     41  libcoinhsl_la_SOURCES += hsl_mc68/hsl_mc68i.f90 hsl_mc68/C/hsl_mc68i_ciface.f90
    4242  includecoin_HEADERS += hsl_mc68/C/hsl_mc68i.h
    4343endif
    … …  
    6767# dependencies
    6868hsl_ma86d_ciface.lo: hsl_ma86d.lo
    69 hsl_ma97d_ciface.lo: hsl_ma97d.lo
     69hsl_ma97d_ciface.lo: hsl_ma97d.lo hsl_mc68i.lo
    7070hsl_mc68i_ciface.lo: deps90.lo
    7171

  • ThirdParty/HSL/trunk/Makefile.in

    r2469 r2484  
    5858@BUILD_COINHSL_TRUE@@COIN_HAS_MA57_TRUE@am__append_4 = ma57/ma57d.f
    5959@BUILD_COINHSL_TRUE@@COIN_HAS_DEPSF90_TRUE@am__append_5 = common/deps90.f90
    60 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@am__append_6 = hsl_mc68/C/hsl_mc68i_ciface.f90
     60@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@am__append_6 = hsl_mc68/hsl_mc68i.f90 hsl_mc68/C/hsl_mc68i_ciface.f90
    6161@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@am__append_7 = hsl_mc68/C/hsl_mc68i.h
    6262@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA77_TRUE@am__append_8 = hsl_ma77/hsl_ma77d.f90
    … …  
    9898am__libcoinhsl_la_SOURCES_DIST = common/deps.f mc19/mc19d.f \
    9999        ma27/ma27d.f ma28/ma28d.f ma57/ma57d.f common/deps90.f90 \
    100         hsl_mc68/C/hsl_mc68i_ciface.f90 hsl_ma77/hsl_ma77d.f90 \
    101         hsl_ma86/hsl_ma86d.f90 hsl_ma86/C/hsl_ma86d_ciface.f90 \
    102         hsl_ma97/hsl_ma97d.f90 hsl_ma97/C/hsl_ma97d_ciface.f90 \
    103         metis_dummy.c
     100        hsl_mc68/hsl_mc68i.f90 hsl_mc68/C/hsl_mc68i_ciface.f90 \
     101        hsl_ma77/hsl_ma77d.f90 hsl_ma86/hsl_ma86d.f90 \
     102        hsl_ma86/C/hsl_ma86d_ciface.f90 hsl_ma97/hsl_ma97d.f90 \
     103        hsl_ma97/C/hsl_ma97d_ciface.f90 metis_dummy.c
    104104@BUILD_COINHSL_TRUE@@COIN_HAS_MC19_TRUE@am__objects_1 = mc19d.lo
    105105@BUILD_COINHSL_TRUE@@COIN_HAS_MA27_TRUE@am__objects_2 = ma27d.lo
    … …  
    107107@BUILD_COINHSL_TRUE@@COIN_HAS_MA57_TRUE@am__objects_4 = ma57d.lo
    108108@BUILD_COINHSL_TRUE@@COIN_HAS_DEPSF90_TRUE@am__objects_5 = deps90.lo
    109 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@am__objects_6 = hsl_mc68i_ciface.lo
     109@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@am__objects_6 =  \
     110@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@    hsl_mc68i.lo \
     111@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@    hsl_mc68i_ciface.lo
    110112@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA77_TRUE@am__objects_7 =  \
    111113@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA77_TRUE@    hsl_ma77d.lo
    … …  
    563565        $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o deps90.lo `test -f 'common/deps90.f90' || echo '$(srcdir)/'`common/deps90.f90
    564566
     567hsl_mc68i.lo: hsl_mc68/hsl_mc68i.f90
     568        $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_mc68i.lo `test -f 'hsl_mc68/hsl_mc68i.f90' || echo '$(srcdir)/'`hsl_mc68/hsl_mc68i.f90
     569
    565570@BUILD_COINHSL_FALSE@hsl_mc68i_ciface.lo: hsl_mc68/C/hsl_mc68i_ciface.f90
    566571        $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_mc68i_ciface.lo `test -f 'hsl_mc68/C/hsl_mc68i_ciface.f90' || echo '$(srcdir)/'`hsl_mc68/C/hsl_mc68i_ciface.f90
    … …  
    932937# dependencies
    933938@BUILD_COINHSL_TRUE@hsl_ma86d_ciface.lo: hsl_ma86d.lo
    934 @BUILD_COINHSL_TRUE@hsl_ma97d_ciface.lo: hsl_ma97d.lo
     939@BUILD_COINHSL_TRUE@hsl_ma97d_ciface.lo: hsl_ma97d.lo hsl_mc68i.lo
    935940@BUILD_COINHSL_TRUE@hsl_mc68i_ciface.lo: deps90.lo
    936941

  • ThirdParty/HSL/trunk/configure

    r2469 r2484  
    19661966if test x"$CXX" != x; then
    19671967  case "$CXX" in
     1968    clang* ) ;;
    19681969    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    19691970      if test x"$CC" = x; then
    … …  
    27852786# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
    27862787case "$CC" in
     2788  clang* ) ;;
    27872789  cl* | */cl* | CL* | */CL* )
    27882790    if test "$ac_cv_prog_cc_g" = yes ; then
    … …  
    27972799coin_cc_is_cl=false
    27982800case "$CC" in
     2801  clang* ) ;;
    27992802  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    28002803    coin_cc_is_cl=true
    … …  
    29002903      *-cygwin* | *-mingw*)
    29012904        case "$CC" in
     2905          clang* ) ;;
    29022906          cl* | */cl* | CL* | */CL*)
    29032907            coin_opt_cflags='-MT -O2'
    … …  
    32213225# Correct the LD variable if we are using the MS or Intel-windows compiler
    32223226case "$CC" in
     3227  clang* ) ;;
    32233228  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    32243229    case $build in
    … …  
    34773482
    34783483# Provide some information about the compiler.
    3479 echo "$as_me:3479:" \
     3484echo "$as_me:3484:" \
    34803485     "checking for Fortran 77 compiler version" >&5
    34813486ac_compiler=`set X $ac_compile; echo $2`
    … …  
    42504255ac_save_FFLAGS=$FFLAGS
    42514256FFLAGS="$FFLAGS $ac_verb"
    4252 (eval echo $as_me:4252: \"$ac_link\") >&5
     4257(eval echo $as_me:4257: \"$ac_link\") >&5
    42534258ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    42544259echo "$ac_f77_v_output" >&5
    … …  
    43284333ac_save_FFLAGS=$FFLAGS
    43294334FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4330 (eval echo $as_me:4330: \"$ac_link\") >&5
     4335(eval echo $as_me:4335: \"$ac_link\") >&5
    43314336ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    43324337echo "$ac_f77_v_output" >&5
    … …  
    52065211
    52075212# Provide some information about the compiler.
    5208 echo "$as_me:5208:" \
     5213echo "$as_me:5213:" \
    52095214     "checking for Fortran compiler version" >&5
    52105215ac_compiler=`set X $ac_compile; echo $2`
    … …  
    69786983*-*-irix6*)
    69796984  # Find out which ABI we are using.
    6980   echo '#line 6980 "configure"' > conftest.$ac_ext
     6985  echo '#line 6985 "configure"' > conftest.$ac_ext
    69816986  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    69826987  (eval $ac_compile) 2>&5
    … …  
    94559460   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    94569461   -e 's:$: $lt_compiler_flag:'`
    9457    (eval echo "\"\$as_me:9457: $lt_compile\"" >&5)
     9462   (eval echo "\"\$as_me:9462: $lt_compile\"" >&5)
    94589463   (eval "$lt_compile" 2>conftest.err)
    94599464   ac_status=$?
    94609465   cat conftest.err >&5
    9461    echo "$as_me:9461: \$? = $ac_status" >&5
     9466   echo "$as_me:9466: \$? = $ac_status" >&5
    94629467   if (exit $ac_status) && test -s "$ac_outfile"; then
    94639468     # The compiler can only warn and ignore the option if not recognized
    … …  
    97239728   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    97249729   -e 's:$: $lt_compiler_flag:'`
    9725    (eval echo "\"\$as_me:9725: $lt_compile\"" >&5)
     9730   (eval echo "\"\$as_me:9730: $lt_compile\"" >&5)
    97269731   (eval "$lt_compile" 2>conftest.err)
    97279732   ac_status=$?
    97289733   cat conftest.err >&5
    9729    echo "$as_me:9729: \$? = $ac_status" >&5
     9734   echo "$as_me:9734: \$? = $ac_status" >&5
    97309735   if (exit $ac_status) && test -s "$ac_outfile"; then
    97319736     # The compiler can only warn and ignore the option if not recognized
    … …  
    98279832   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    98289833   -e 's:$: $lt_compiler_flag:'`
    9829    (eval echo "\"\$as_me:9829: $lt_compile\"" >&5)
     9834   (eval echo "\"\$as_me:9834: $lt_compile\"" >&5)
    98309835   (eval "$lt_compile" 2>out/conftest.err)
    98319836   ac_status=$?
    98329837   cat out/conftest.err >&5
    9833    echo "$as_me:9833: \$? = $ac_status" >&5
     9838   echo "$as_me:9838: \$? = $ac_status" >&5
    98349839   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    98359840   then
    … …  
    1224412249  lt_status=$lt_dlunknown
    1224512250  cat > conftest.$ac_ext <<EOF
    12246 #line 12246 "configure"
     12251#line 12251 "configure"
    1224712252#include "confdefs.h"
    1224812253
    … …  
    1234412349  lt_status=$lt_dlunknown
    1234512350  cat > conftest.$ac_ext <<EOF
    12346 #line 12346 "configure"
     12351#line 12351 "configure"
    1234712352#include "confdefs.h"
    1234812353
    … …  
    1470414709   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1470514710   -e 's:$: $lt_compiler_flag:'`
    14706    (eval echo "\"\$as_me:14706: $lt_compile\"" >&5)
     14711   (eval echo "\"\$as_me:14711: $lt_compile\"" >&5)
    1470714712   (eval "$lt_compile" 2>conftest.err)
    1470814713   ac_status=$?
    1470914714   cat conftest.err >&5
    14710    echo "$as_me:14710: \$? = $ac_status" >&5
     14715   echo "$as_me:14715: \$? = $ac_status" >&5
    1471114716   if (exit $ac_status) && test -s "$ac_outfile"; then
    1471214717     # The compiler can only warn and ignore the option if not recognized
    … …  
    1480814813   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1480914814   -e 's:$: $lt_compiler_flag:'`
    14810    (eval echo "\"\$as_me:14810: $lt_compile\"" >&5)
     14815   (eval echo "\"\$as_me:14815: $lt_compile\"" >&5)
    1481114816   (eval "$lt_compile" 2>out/conftest.err)
    1481214817   ac_status=$?
    1481314818   cat out/conftest.err >&5
    14814    echo "$as_me:14814: \$? = $ac_status" >&5
     14819   echo "$as_me:14819: \$? = $ac_status" >&5
    1481514820   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1481614821   then
    … …  
    1637816383   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1637916384   -e 's:$: $lt_compiler_flag:'`
    16380    (eval echo "\"\$as_me:16380: $lt_compile\"" >&5)
     16385   (eval echo "\"\$as_me:16385: $lt_compile\"" >&5)
    1638116386   (eval "$lt_compile" 2>conftest.err)
    1638216387   ac_status=$?
    1638316388   cat conftest.err >&5
    16384    echo "$as_me:16384: \$? = $ac_status" >&5
     16389   echo "$as_me:16389: \$? = $ac_status" >&5
    1638516390   if (exit $ac_status) && test -s "$ac_outfile"; then
    1638616391     # The compiler can only warn and ignore the option if not recognized
    … …  
    1648216487   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1648316488   -e 's:$: $lt_compiler_flag:'`
    16484    (eval echo "\"\$as_me:16484: $lt_compile\"" >&5)
     16489   (eval echo "\"\$as_me:16489: $lt_compile\"" >&5)
    1648516490   (eval "$lt_compile" 2>out/conftest.err)
    1648616491   ac_status=$?
    1648716492   cat out/conftest.err >&5
    16488    echo "$as_me:16488: \$? = $ac_status" >&5
     16493   echo "$as_me:16493: \$? = $ac_status" >&5
    1648916494   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1649016495   then
    … …  
    1868918694   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1869018695   -e 's:$: $lt_compiler_flag:'`
    18691    (eval echo "\"\$as_me:18691: $lt_compile\"" >&5)
     18696   (eval echo "\"\$as_me:18696: $lt_compile\"" >&5)
    1869218697   (eval "$lt_compile" 2>conftest.err)
    1869318698   ac_status=$?
    1869418699   cat conftest.err >&5
    18695    echo "$as_me:18695: \$? = $ac_status" >&5
     18700   echo "$as_me:18700: \$? = $ac_status" >&5
    1869618701   if (exit $ac_status) && test -s "$ac_outfile"; then
    1869718702     # The compiler can only warn and ignore the option if not recognized
    … …  
    1895718962   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1895818963   -e 's:$: $lt_compiler_flag:'`
    18959    (eval echo "\"\$as_me:18959: $lt_compile\"" >&5)
     18964   (eval echo "\"\$as_me:18964: $lt_compile\"" >&5)
    1896018965   (eval "$lt_compile" 2>conftest.err)
    1896118966   ac_status=$?
    1896218967   cat conftest.err >&5
    18963    echo "$as_me:18963: \$? = $ac_status" >&5
     18968   echo "$as_me:18968: \$? = $ac_status" >&5
    1896418969   if (exit $ac_status) && test -s "$ac_outfile"; then
    1896518970     # The compiler can only warn and ignore the option if not recognized
    … …  
    1906119066   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1906219067   -e 's:$: $lt_compiler_flag:'`
    19063    (eval echo "\"\$as_me:19063: $lt_compile\"" >&5)
     19068   (eval echo "\"\$as_me:19068: $lt_compile\"" >&5)
    1906419069   (eval "$lt_compile" 2>out/conftest.err)
    1906519070   ac_status=$?
    1906619071   cat out/conftest.err >&5
    19067    echo "$as_me:19067: \$? = $ac_status" >&5
     19072   echo "$as_me:19072: \$? = $ac_status" >&5
    1906819073   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1906919074   then
    … …  
    2181721822    *-cygwin* | *-mingw*)
    2181821823       case "$CXX" in
     21824    clang* )
     21825      # we assume that libtool patches for CLANG are the same as for GNU compiler - correct???
     21826      { echo "$as_me:$LINENO: Applying patches to libtool for CLANG compiler" >&5
     21827echo "$as_me: Applying patches to libtool for CLANG compiler" >&6;}
     21828      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     21829          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     21830          -e 's|libext="lib"|libext="a"|' \
     21831      libtool > conftest.bla
     21832      ;;
    2181921833    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2182021834      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
    … …  
    2183221846          -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
    2183321847      libtool > conftest.bla
    21834 
    21835       mv conftest.bla libtool
    21836       chmod 755 libtool
    2183721848      ;;
    2183821849    *)
    … …  
    2184321854          -e 's|libext="lib"|libext="a"|' \
    2184421855      libtool > conftest.bla
    21845 
    21846       mv conftest.bla libtool
    21847       chmod 755 libtool
    2184821856      ;;
    2184921857  esac
     21858  mv conftest.bla libtool
     21859  chmod 755 libtool
     21860
    2185021861      ;;
    2185121862    *-darwin*)
    … …  
    2358223593      fi
    2358323594      case "$CC" in
     23595        clang* ) ;;
    2358423596        cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2358523597          coin_save_LIBS="$LIBS"
    … …  
    2639826410fi
    2639926411case "$CC" in
     26412  clang* ) ;;
    2640026413  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2640126414    coin_link_input_cmd=cp ;;
    … …  
    2641126424
    2641226425  case "$CC" in
     26426    clang* )
     26427         LIBEXT=a ;;
    2641326428    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2641426429         LIBEXT=lib ;;
Note: See TracChangeset for help on using the changeset viewer.