Changeset 4132


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

some cleanup, rerun autotools, add ar-lib

Location:
ThirdParty/HSL/trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/trunk/Makefile.am

    r4023 r4132  
    22# All Rights Reserved.
    33# This file is distributed under the Eclipse Public License.
    4 
    5 AUTOMAKE_OPTIONS = foreign subdir-objects
    64
    75EXTRA_DIST = INSTALL.HSL
     
    8886
    8987CLEANFILES = *.mod
    90 
    91 # Files that are generated and should be cleaned with make distclean
    92 DISTCLEANFILES =
  • ThirdParty/HSL/trunk/Makefile.in

    r4073 r4132  
    415415top_builddir = @top_builddir@
    416416top_srcdir = @top_srcdir@
    417 AUTOMAKE_OPTIONS = foreign subdir-objects
    418417EXTRA_DIST = INSTALL.HSL
    419418includecoindir = $(includedir)/coin-or/hsl
     
    441440########################################################################
    442441CLEANFILES = *.mod
    443 
    444 # Files that are generated and should be cleaned with make distclean
    445 DISTCLEANFILES =
    446442all: config.h CoinHslConfig.h
    447443        $(MAKE) $(AM_MAKEFLAGS) all-am
     
    908904        -rm -f coinhsl/mc19/$(DEPDIR)/$(am__dirstamp)
    909905        -rm -f coinhsl/mc19/$(am__dirstamp)
    910         -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
    911906
    912907maintainer-clean-generic:
  • ThirdParty/HSL/trunk/configure

    r4126 r4132  
    687687MANIFEST_TOOL
    688688RANLIB
    689 ac_ct_AR
    690 AR
    691689DLLTOOL
    692690OBJDUMP
     
    701699SED
    702700LIBTOOL
     701ac_ct_AR
     702AR
    703703ADD_FCFLAGS
    704704ac_ct_FC
     
    25842584      : ${CFLAGS:="-nologo -Z7 -MDd $ADD_CFLAGS"}
    25852585      : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd $ADD_CXXFLAGS"}
    2586       : ${AR:="lib"}
    2587       : ${AR_FLAGS:="-nologo -out:"}
    25882586    else
    25892587      : ${FFLAGS:="-g $ADD_FFLAGS"}
     
    25982596      : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD $ADD_CFLAGS"}
    25992597      : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD $ADD_CXXFLAGS"}
    2600       : ${AR:="lib"}
    2601       : ${AR_FLAGS:="-nologo -out:"}
    26022598    else
    26032599      : ${FFLAGS:="-O2 $ADD_FFLAGS"}
     
    31853181
    31863182# Initialize automake
     3183# - do not be as strict as for GNU projects
    31873184# - don't AC_DEFINE PACKAGE or VERSION (but there're still defined as shell
    31883185#   variables in configure, and as make variables).
    31893186# - disable dist target
     3187# - place objects from sources in subdirs into corresponding subdirs
    31903188# - enable all automake warnings
    31913189
     
    34933491      ac_cv_prog_CC="$CC"
    34943492      LD="$CC"
     3493      : ${AR:=lib}
    34953494    else
    34963495      as_fn_error $? "Neither MS nor Intel C compiler found in PATH and CC is unset." "$LINENO" 5
     
    43614360        ac_cv_prog_F77="$F77"
    43624361        LD="$F77"
     4362        : ${AR:=lib}
    43634363      fi
    43644364    fi
     
    94519451
    94529452
     9453# checkout AR and decide whether to use ar-lib wrapper
     9454  if test -n "$ac_tool_prefix"; then
     9455  for ac_prog in ar lib "link -lib"
     9456  do
     9457    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     9458set dummy $ac_tool_prefix$ac_prog; ac_word=$2
     9459{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     9460$as_echo_n "checking for $ac_word... " >&6; }
     9461if ${ac_cv_prog_AR+:} false; then :
     9462  $as_echo_n "(cached) " >&6
     9463else
     9464  if test -n "$AR"; then
     9465  ac_cv_prog_AR="$AR" # Let the user override the test.
     9466else
     9467as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     9468for as_dir in $PATH
     9469do
     9470  IFS=$as_save_IFS
     9471  test -z "$as_dir" && as_dir=.
     9472    for ac_exec_ext in '' $ac_executable_extensions; do
     9473  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     9474    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     9475    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     9476    break 2
     9477  fi
     9478done
     9479  done
     9480IFS=$as_save_IFS
     9481
     9482fi
     9483fi
     9484AR=$ac_cv_prog_AR
     9485if test -n "$AR"; then
     9486  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
     9487$as_echo "$AR" >&6; }
     9488else
     9489  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     9490$as_echo "no" >&6; }
     9491fi
     9492
     9493
     9494    test -n "$AR" && break
     9495  done
     9496fi
     9497if test -z "$AR"; then
     9498  ac_ct_AR=$AR
     9499  for ac_prog in ar lib "link -lib"
     9500do
     9501  # Extract the first word of "$ac_prog", so it can be a program name with args.
     9502set dummy $ac_prog; ac_word=$2
     9503{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     9504$as_echo_n "checking for $ac_word... " >&6; }
     9505if ${ac_cv_prog_ac_ct_AR+:} false; then :
     9506  $as_echo_n "(cached) " >&6
     9507else
     9508  if test -n "$ac_ct_AR"; then
     9509  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
     9510else
     9511as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     9512for as_dir in $PATH
     9513do
     9514  IFS=$as_save_IFS
     9515  test -z "$as_dir" && as_dir=.
     9516    for ac_exec_ext in '' $ac_executable_extensions; do
     9517  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     9518    ac_cv_prog_ac_ct_AR="$ac_prog"
     9519    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     9520    break 2
     9521  fi
     9522done
     9523  done
     9524IFS=$as_save_IFS
     9525
     9526fi
     9527fi
     9528ac_ct_AR=$ac_cv_prog_ac_ct_AR
     9529if test -n "$ac_ct_AR"; then
     9530  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
     9531$as_echo "$ac_ct_AR" >&6; }
     9532else
     9533  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     9534$as_echo "no" >&6; }
     9535fi
     9536
     9537
     9538  test -n "$ac_ct_AR" && break
     9539done
     9540
     9541  if test "x$ac_ct_AR" = x; then
     9542    AR="false"
     9543  else
     9544    case $cross_compiling:$ac_tool_warned in
     9545yes:)
     9546{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     9547$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     9548ac_tool_warned=yes ;;
     9549esac
     9550    AR=$ac_ct_AR
     9551  fi
     9552fi
     9553
     9554: ${AR=ar}
     9555
     9556{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
     9557$as_echo_n "checking the archiver ($AR) interface... " >&6; }
     9558if ${am_cv_ar_interface+:} false; then :
     9559  $as_echo_n "(cached) " >&6
     9560else
     9561  ac_ext=c
     9562ac_cpp='$CPP $CPPFLAGS'
     9563ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     9564ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     9565ac_compiler_gnu=$ac_cv_c_compiler_gnu
     9566
     9567   am_cv_ar_interface=ar
     9568   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     9569/* end confdefs.h.  */
     9570int some_variable = 0;
     9571_ACEOF
     9572if ac_fn_c_try_compile "$LINENO"; then :
     9573  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
     9574      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
     9575  (eval $am_ar_try) 2>&5
     9576  ac_status=$?
     9577  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     9578  test $ac_status = 0; }
     9579      if test "$ac_status" -eq 0; then
     9580        am_cv_ar_interface=ar
     9581      else
     9582        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
     9583        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
     9584  (eval $am_ar_try) 2>&5
     9585  ac_status=$?
     9586  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     9587  test $ac_status = 0; }
     9588        if test "$ac_status" -eq 0; then
     9589          am_cv_ar_interface=lib
     9590        else
     9591          am_cv_ar_interface=unknown
     9592        fi
     9593      fi
     9594      rm -f conftest.lib libconftest.a
     9595
     9596fi
     9597rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     9598   ac_ext=c
     9599ac_cpp='$CPP $CPPFLAGS'
     9600ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     9601ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     9602ac_compiler_gnu=$ac_cv_c_compiler_gnu
     9603
     9604fi
     9605{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
     9606$as_echo "$am_cv_ar_interface" >&6; }
     9607
     9608case $am_cv_ar_interface in
     9609ar)
     9610  ;;
     9611lib)
     9612  # Microsoft lib, so override with the ar-lib wrapper script.
     9613  # FIXME: It is wrong to rewrite AR.
     9614  # But if we don't then we get into trouble of one sort or another.
     9615  # A longer-term fix would be to have automake use am__AR in this case,
     9616  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
     9617  # similar.
     9618  AR="$am_aux_dir/ar-lib $AR"
     9619  ;;
     9620unknown)
     9621  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
     9622  ;;
     9623esac
     9624
     9625
    94539626# Create libtool.
    9454 
    94559627
    94569628
     
    1986220034# Patch libtool to circumvent some issues when using MSVC and MS lib.
    1986320035# This needs to be run after config.status has created libtool.
    19864 # 1. Eliminate a trailing space after AR_FLAGS. Apparently necessary on
    19865 #    Windows when AR=lib.exe.
    19866 # 2. Patch libtool's func_extract_an_archive in case of $AR=lib. The current
    19867 #    libtool implementation assumes that it can do $AR x to extract an archive.
    19868 #    We replace this two-liner in func_extract_an_archive by replacing the first
    19869 #    line by something clunky that works with lib and making sure that the following
    19870 #    line is ignored (by finishing with ": \"). We completely disregard running the
    19871 #    command through func_show_eval and do not stop if it fails.
    19872 # 3. Relax check which libraries can be used when linking a DLL.
     20036# 1. Relax check which libraries can be used when linking a DLL.
    1987320037#    libtool's func_mode_link() would reject linking a .lib file when building a DLL,
    1987420038#    even though this .lib file may just be the one that eventually loads a depending DLL,
    1987520039#    e.g., mkl_core_dll.lib. Setting deplibs_check_method=pass_all will still print a
    1987620040#    warning, but the .lib is still passed to the linker.
    19877 # 4. Ensure always_export_symbols=no if win32-dll. Even when we pass win32-dll,
     20041# 2. Ensure always_export_symbols=no if win32-dll. Even when we pass win32-dll,
    1987820042#    libtool forces always_export_symbols=yes for --tag=CXX if using MS compiler.
    1987920043#    This leads to a nm call that collects ALL C-functions from a library
    1988020044#    and explicitly dll-exporting them, leading to warnings about duplicates
    1988120045#    regarding those that are properly marked for dll-export in the source.
    19882 # 5. Do not add mkl_*.lib to old_deplibs, which can result in trying to unpack and repack
     20046# 3. Do not add mkl_*.lib to old_deplibs, which can result in trying to unpack and repack
    1988320047#    the MKL libraries (which are pretty big). Instead, treat them like other -l<...> libs.
    19884 # 6. Add MKL libraries to dependency_libs in .la file, which I guess should be
     20048# 4. Add MKL libraries to dependency_libs in .la file, which I guess should be
    1988520049#    the case due to point 5.
    1988620050#
     
    1989320057#    this faulty check.
    1989420058
    19895   case "$AR" in
    19896     *lib* | *LIB* )
     20059  case "$am_cv_ar_interface" in
     20060    lib )
    1989720061      ac_config_commands="$ac_config_commands libtoolclpatch"
    1989820062
     
    2458624750
    2458724751 ;;
    24588     "libtoolclpatch":C) sed -e 's|AR_FLAGS |AR_FLAGS|g' \
    24589              -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' \
    24590              -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
     24752    "libtoolclpatch":C) sed -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
    2459124753              \
    2459224754             -e '/func_append old_deplibs/s/\(.*\)/case $arg in *mkl_*.lib) ;; *) \1 ;; esac/g' \
Note: See TracChangeset for help on using the changeset viewer.