Changeset 4131


Ignore:
Timestamp:
Mar 19, 2020 12:49:05 PM (2 weeks ago)
Author:
stefan
Message:

rerun autotools, add ar-lib

Location:
ThirdParty/ASL/trunk
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/trunk/Makefile.in

    r4129 r4131  
    478478pkgconfiglib_DATA = coinasl.pc
    479479CLEANFILES = arith.h details.c
    480 
    481 ########################################################################
    482 #                         Maintainer Stuff                             #
    483 ########################################################################
    484 
    485 # Files that are generated and should be cleaned with make distclean
    486 DISTCLEANFILES =
    487480all: $(BUILT_SOURCES)
    488481        $(MAKE) $(AM_MAKEFLAGS) all-am
     
    10731066        -rm -f solvers/$(DEPDIR)/$(am__dirstamp)
    10741067        -rm -f solvers/$(am__dirstamp)
    1075         -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
    10761068
    10771069maintainer-clean-generic:
  • ThirdParty/ASL/trunk/configure

    r4129 r4131  
    659659MANIFEST_TOOL
    660660RANLIB
    661 ac_ct_AR
    662 AR
    663661DLLTOOL
    664662OBJDUMP
     
    673671SED
    674672LIBTOOL
     673ac_ct_AR
     674AR
    675675ADD_CFLAGS
    676676am__fastdepCC_FALSE
     
    23832383      : ${CFLAGS:="-nologo -Z7 -MDd $ADD_CFLAGS"}
    23842384      : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd $ADD_CXXFLAGS"}
    2385       : ${AR:="lib"}
    2386       : ${AR_FLAGS:="-nologo -out:"}
    23872385    else
    23882386      : ${FFLAGS:="-g $ADD_FFLAGS"}
     
    23972395      : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD $ADD_CFLAGS"}
    23982396      : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD $ADD_CXXFLAGS"}
    2399       : ${AR:="lib"}
    2400       : ${AR_FLAGS:="-nologo -out:"}
    24012397    else
    24022398      : ${FFLAGS:="-O2 $ADD_FFLAGS"}
     
    32903286      ac_cv_prog_CC="$CC"
    32913287      LD="$CC"
     3288      : ${AR:=lib}
    32923289    else
    32933290      as_fn_error $? "Neither MS nor Intel C compiler found in PATH and CC is unset." "$LINENO" 5
     
    40904087
    40914088# Initialize libtool
     4089
    40924090case `pwd` in
    40934091  *\ * | *\     *)
     
    55825580sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
    55835581test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
    5584 
    55855582
    55865583
     
    77897786
    77907787
     7788# checkout AR and decide whether to use ar-lib wrapper
     7789  if test -n "$ac_tool_prefix"; then
     7790  for ac_prog in ar lib "link -lib"
     7791  do
     7792    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     7793set dummy $ac_tool_prefix$ac_prog; ac_word=$2
     7794{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     7795$as_echo_n "checking for $ac_word... " >&6; }
     7796if ${ac_cv_prog_AR+:} false; then :
     7797  $as_echo_n "(cached) " >&6
     7798else
     7799  if test -n "$AR"; then
     7800  ac_cv_prog_AR="$AR" # Let the user override the test.
     7801else
     7802as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     7803for as_dir in $PATH
     7804do
     7805  IFS=$as_save_IFS
     7806  test -z "$as_dir" && as_dir=.
     7807    for ac_exec_ext in '' $ac_executable_extensions; do
     7808  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7809    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     7810    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     7811    break 2
     7812  fi
     7813done
     7814  done
     7815IFS=$as_save_IFS
     7816
     7817fi
     7818fi
     7819AR=$ac_cv_prog_AR
     7820if test -n "$AR"; then
     7821  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
     7822$as_echo "$AR" >&6; }
     7823else
     7824  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     7825$as_echo "no" >&6; }
     7826fi
     7827
     7828
     7829    test -n "$AR" && break
     7830  done
     7831fi
     7832if test -z "$AR"; then
     7833  ac_ct_AR=$AR
     7834  for ac_prog in ar lib "link -lib"
     7835do
     7836  # Extract the first word of "$ac_prog", so it can be a program name with args.
     7837set dummy $ac_prog; ac_word=$2
     7838{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     7839$as_echo_n "checking for $ac_word... " >&6; }
     7840if ${ac_cv_prog_ac_ct_AR+:} false; then :
     7841  $as_echo_n "(cached) " >&6
     7842else
     7843  if test -n "$ac_ct_AR"; then
     7844  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
     7845else
     7846as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     7847for as_dir in $PATH
     7848do
     7849  IFS=$as_save_IFS
     7850  test -z "$as_dir" && as_dir=.
     7851    for ac_exec_ext in '' $ac_executable_extensions; do
     7852  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7853    ac_cv_prog_ac_ct_AR="$ac_prog"
     7854    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     7855    break 2
     7856  fi
     7857done
     7858  done
     7859IFS=$as_save_IFS
     7860
     7861fi
     7862fi
     7863ac_ct_AR=$ac_cv_prog_ac_ct_AR
     7864if test -n "$ac_ct_AR"; then
     7865  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
     7866$as_echo "$ac_ct_AR" >&6; }
     7867else
     7868  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     7869$as_echo "no" >&6; }
     7870fi
     7871
     7872
     7873  test -n "$ac_ct_AR" && break
     7874done
     7875
     7876  if test "x$ac_ct_AR" = x; then
     7877    AR="false"
     7878  else
     7879    case $cross_compiling:$ac_tool_warned in
     7880yes:)
     7881{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     7882$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     7883ac_tool_warned=yes ;;
     7884esac
     7885    AR=$ac_ct_AR
     7886  fi
     7887fi
     7888
     7889: ${AR=ar}
     7890
     7891{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
     7892$as_echo_n "checking the archiver ($AR) interface... " >&6; }
     7893if ${am_cv_ar_interface+:} false; then :
     7894  $as_echo_n "(cached) " >&6
     7895else
     7896  ac_ext=c
     7897ac_cpp='$CPP $CPPFLAGS'
     7898ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     7899ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     7900ac_compiler_gnu=$ac_cv_c_compiler_gnu
     7901
     7902   am_cv_ar_interface=ar
     7903   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     7904/* end confdefs.h.  */
     7905int some_variable = 0;
     7906_ACEOF
     7907if ac_fn_c_try_compile "$LINENO"; then :
     7908  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
     7909      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
     7910  (eval $am_ar_try) 2>&5
     7911  ac_status=$?
     7912  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     7913  test $ac_status = 0; }
     7914      if test "$ac_status" -eq 0; then
     7915        am_cv_ar_interface=ar
     7916      else
     7917        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
     7918        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
     7919  (eval $am_ar_try) 2>&5
     7920  ac_status=$?
     7921  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     7922  test $ac_status = 0; }
     7923        if test "$ac_status" -eq 0; then
     7924          am_cv_ar_interface=lib
     7925        else
     7926          am_cv_ar_interface=unknown
     7927        fi
     7928      fi
     7929      rm -f conftest.lib libconftest.a
     7930
     7931fi
     7932rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     7933   ac_ext=c
     7934ac_cpp='$CPP $CPPFLAGS'
     7935ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     7936ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     7937ac_compiler_gnu=$ac_cv_c_compiler_gnu
     7938
     7939fi
     7940{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
     7941$as_echo "$am_cv_ar_interface" >&6; }
     7942
     7943case $am_cv_ar_interface in
     7944ar)
     7945  ;;
     7946lib)
     7947  # Microsoft lib, so override with the ar-lib wrapper script.
     7948  # FIXME: It is wrong to rewrite AR.
     7949  # But if we don't then we get into trouble of one sort or another.
     7950  # A longer-term fix would be to have automake use am__AR in this case,
     7951  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
     7952  # similar.
     7953  AR="$am_aux_dir/ar-lib $AR"
     7954  ;;
     7955unknown)
     7956  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
     7957  ;;
     7958esac
     7959
     7960
    77917961# Create libtool.
    7792 
    77937962
    77947963
     
    1208812257# Patch libtool to circumvent some issues when using MSVC and MS lib.
    1208912258# This needs to be run after config.status has created libtool.
    12090 # 1. Eliminate a trailing space after AR_FLAGS. Apparently necessary on
    12091 #    Windows when AR=lib.exe.
    12092 # 2. Patch libtool's func_extract_an_archive in case of $AR=lib. The current
    12093 #    libtool implementation assumes that it can do $AR x to extract an archive.
    12094 #    We replace this two-liner in func_extract_an_archive by replacing the first
    12095 #    line by something clunky that works with lib and making sure that the following
    12096 #    line is ignored (by finishing with ": \"). We completely disregard running the
    12097 #    command through func_show_eval and do not stop if it fails.
    12098 # 3. Relax check which libraries can be used when linking a DLL.
     12259# 1. Relax check which libraries can be used when linking a DLL.
    1209912260#    libtool's func_mode_link() would reject linking a .lib file when building a DLL,
    1210012261#    even though this .lib file may just be the one that eventually loads a depending DLL,
    1210112262#    e.g., mkl_core_dll.lib. Setting deplibs_check_method=pass_all will still print a
    1210212263#    warning, but the .lib is still passed to the linker.
    12103 # 4. Ensure always_export_symbols=no if win32-dll. Even when we pass win32-dll,
     12264# 2. Ensure always_export_symbols=no if win32-dll. Even when we pass win32-dll,
    1210412265#    libtool forces always_export_symbols=yes for --tag=CXX if using MS compiler.
    1210512266#    This leads to a nm call that collects ALL C-functions from a library
    1210612267#    and explicitly dll-exporting them, leading to warnings about duplicates
    1210712268#    regarding those that are properly marked for dll-export in the source.
    12108 # 5. Do not add mkl_*.lib to old_deplibs, which can result in trying to unpack and repack
     12269# 3. Do not add mkl_*.lib to old_deplibs, which can result in trying to unpack and repack
    1210912270#    the MKL libraries (which are pretty big). Instead, treat them like other -l<...> libs.
    12110 # 6. Add MKL libraries to dependency_libs in .la file, which I guess should be
     12271# 4. Add MKL libraries to dependency_libs in .la file, which I guess should be
    1211112272#    the case due to point 5.
    1211212273#
     
    1211912280#    this faulty check.
    1212012281
    12121   case "$AR" in
    12122     *lib* | *LIB* )
     12282  case "$am_cv_ar_interface" in
     12283    lib )
    1212312284      ac_config_commands="$ac_config_commands libtoolclpatch"
    1212412285
     
    1457014731
    1457114732 ;;
    14572     "libtoolclpatch":C) sed -e 's|AR_FLAGS |AR_FLAGS|g' \
    14573              -e '/$AR x/s/.*/( cd $f_ex_an_ar_dir ; for f in `$AR -nologo -list "$f_ex_an_ar_oldlib" | tr "\\r" " "` ; do lib -nologo -extract:$f "$f_ex_an_ar_oldlib"; done ); : \\/g' \
    14574              -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
     14733    "libtoolclpatch":C) sed -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
    1457514734              \
    1457614735             -e '/func_append old_deplibs/s/\(.*\)/case $arg in *mkl_*.lib) ;; *) \1 ;; esac/g' \
Note: See TracChangeset for help on using the changeset viewer.