Changeset 4116


Ignore:
Timestamp:
Jan 31, 2020 9:51:46 AM (2 months ago)
Author:
stefan
Message:

sync with trunk

Location:
ThirdParty/Mumps/stable/2.0
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/stable/2.0

  • ThirdParty/Mumps/stable/2.0/Makefile.am

    r4025 r4116  
    7474CLEANFILES = *.mod
    7575
    76 CFLAGS += $(MY_DEFS)
     76CFLAGS += $(MY_DEFS) $(MUMPS_CFLAGS)
    7777FCFLAGS += $(MY_FDEFS)
    7878
  • ThirdParty/Mumps/stable/2.0/Makefile.in

    r4025 r4116  
    265265AM_RECURSIVE_TARGETS = cscope
    266266ACLOCAL = @ACLOCAL@
     267ADD_CFLAGS = @ADD_CFLAGS@
     268ADD_FCFLAGS = @ADD_FCFLAGS@
    267269AMTAR = @AMTAR@
    268270AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
     
    275277CC = @CC@
    276278CCDEPMODE = @CCDEPMODE@
    277 CFLAGS = @CFLAGS@ $(MY_DEFS)
     279CFLAGS = @CFLAGS@ $(MY_DEFS) $(MUMPS_CFLAGS)
    278280COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    279281CPP = @CPP@
  • ThirdParty/Mumps/stable/2.0/coinmumps.pc.in

    r4025 r4116  
    1 prefix=@prefix@
     1@COIN_RELOCATABLE_FALSE@prefix=@prefix@
     2@COIN_RELOCATABLE_TRUE@prefix=${pcfiledir}/../..
    23exec_prefix=@exec_prefix@
    34libdir=@libdir@
  • ThirdParty/Mumps/stable/2.0/configure

    r4034 r4116  
    686686DLLTOOL
    687687AS
     688ADD_FCFLAGS
    688689ac_ct_FC
    689690FCFLAGS
    690691FC
     692ADD_CFLAGS
    691693am__fastdepCC_FALSE
    692694am__fastdepCC_TRUE
     
    704706LDFLAGS
    705707CFLAGS
     708COIN_RELOCATABLE_FALSE
     709COIN_RELOCATABLE_TRUE
    706710MAINT
    707711MAINTAINER_MODE_FALSE
     
    791795enable_silent_rules
    792796enable_maintainer_mode
     797enable_relocatable
    793798enable_dependency_tracking
    794799enable_static
     
    816821LIBS
    817822CPPFLAGS
     823ADD_CFLAGS
    818824FC
    819825FCFLAGS
     826ADD_FCFLAGS
    820827LT_SYS_LIBRARY_PATH
    821828CPP
     829LT_LDFLAGS
    822830PKG_CONFIG'
    823831
     
    14481456                          enable make rules and dependencies not useful (and
    14491457                          sometimes confusing) to the casual installer
     1458  --enable-relocatable    whether prefix in installed .pc files should be
     1459                          setup relative to pcfiledir
    14501460  --enable-dependency-tracking
    14511461                          do not reject slow dependency extractors
     
    14981508  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
    14991509              you have headers in a nonstandard directory <include dir>
     1510  ADD_CFLAGS  Additional C compiler options (if not overwriting CFLAGS)
    15001511  FC          Fortran compiler command
    15011512  FCFLAGS     Fortran compiler flags
     1513  ADD_FCFLAGS Additional Fortran compiler options (if not overwriting FCFLAGS)
    15021514  LT_SYS_LIBRARY_PATH
    15031515              User-defined run-time library search path.
    15041516  CPP         C preprocessor
     1517  LT_LDFLAGS  Flags passed to libtool when building libraries or executables
     1518              that are installed
    15051519  PKG_CONFIG  path to pkg-config utility
    15061520
     
    25382552  if test "$enable_debug" = yes ; then
    25392553    if test "$enable_msvc" = yes ; then
    2540       : ${FFLAGS:="-nologo -fpp -Z7 -MDd"}
    2541       : ${FCFLAGS:="-nologo -fpp -Z7 -MDd"}
    2542       : ${CFLAGS:="-nologo -Z7 -MDd"}
    2543       : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd"}
     2554      : ${FFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FFLAGS"}
     2555      : ${FCFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FCFLAGS"}
     2556      : ${CFLAGS:="-nologo -Z7 -MDd $ADD_CFLAGS"}
     2557      : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd $ADD_CXXFLAGS"}
    25442558      : ${AR:="lib"}
    25452559      : ${AR_FLAGS:="-nologo -out:"}
    25462560    else
    2547       : ${FFLAGS:="-g"}
    2548       : ${FCFLAGS:="-g"}
    2549       : ${CFLAGS:="-g"}
    2550       : ${CXXFLAGS:="-g"}
     2561      : ${FFLAGS:="-g $ADD_FFLAGS"}
     2562      : ${FCFLAGS:="-g $ADD_FCFLAGS"}
     2563      : ${CFLAGS:="-g $ADD_CFLAGS"}
     2564      : ${CXXFLAGS:="-g $ADD_CXXFLAGS"}
    25512565    fi
    25522566  else
    25532567    if test "$enable_msvc" = yes ; then
    2554       : ${FFLAGS:="-nologo -fpp -O2 -MD"}
    2555       : ${FCFLAGS:="-nologo -fpp -O2 -MD"}
    2556       : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD"}
    2557       : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD"}
     2568      : ${FFLAGS:="-nologo -fpp -O2 -MD $ADD_FFLAGS"}
     2569      : ${FCFLAGS:="-nologo -fpp -O2 -MD $ADD_FCFLAGS"}
     2570      : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD $ADD_CFLAGS"}
     2571      : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD $ADD_CXXFLAGS"}
    25582572      : ${AR:="lib"}
    25592573      : ${AR_FLAGS:="-nologo -out:"}
    25602574    else
    2561       : ${FFLAGS:="-O2"}
    2562       : ${FCFLAGS:="-O2"}
    2563       : ${CFLAGS:="-O2 -DNDEBUG"}
    2564       : ${CXXFLAGS:="-O2 -DNDEBUG"}
     2575      : ${FFLAGS:="-O2 $ADD_FFLAGS"}
     2576      : ${FCFLAGS:="-O2 $ADD_FCFLAGS"}
     2577      : ${CFLAGS:="-O2 -DNDEBUG $ADD_CFLAGS"}
     2578      : ${CXXFLAGS:="-O2 -DNDEBUG $ADD_CXXFLAGS"}
    25652579    fi
    25662580  fi
     
    33023316  exec_prefix=$save_exec_prefix
    33033317
     3318# add a configure flag to indicate whether .pc files should be made relocatable
     3319# off by default, as it creates libtool warnings
     3320  # Check whether --enable-relocatable was given.
     3321if test "${enable_relocatable+set}" = set; then :
     3322  enableval=$enable_relocatable; coin_enable_relocatable=$enableval
     3323else
     3324  coin_enable_relocatable=no
     3325fi
     3326
     3327   if test $coin_enable_relocatable = yes; then
     3328  COIN_RELOCATABLE_TRUE=
     3329  COIN_RELOCATABLE_FALSE='#'
     3330else
     3331  COIN_RELOCATABLE_TRUE='#'
     3332  COIN_RELOCATABLE_FALSE=
     3333fi
     3334
     3335
    33043336
    33053337#############################################################################
     
    33793411
    33803412  # If enable-msvc, then test for Intel (on Windows) and MS C compiler
    3381   # explicitly and add compile-wrapper before AC_PROG_CC, because
    3382   # the compile-wrapper work around issues when having the wrong link.exe
    3383   # in the PATH first, which would upset tests in AC_PROG_CC.
    3384   # Further, if CC unset and not set by user, then stop with error.
     3413  # explicitly and add the compile wrapper before AC_PROG_CC. The compile
     3414  # wrapper works around issues related to finding MS link.exe. (Unix link.exe
     3415  # occurs first in PATH, which causes compile and link checks to fail.) For
     3416  # the same reason, set LD to use the compile wrapper. If CC remains unset
     3417  # (neither icl or cl was found, and CC was not set by the user), stop with
     3418  # an error.
     3419
    33853420  if test $enable_msvc = yes ; then
    33863421    for ac_prog in icl cl
     
    34283463    if test -n "$CC" ; then
    34293464      CC="$am_aux_dir/compile $CC"
     3465      ac_cv_prog_CC="$CC"
     3466      LD="$CC"
    34303467    else
    34313468      as_fn_error $? "Neither MS nor Intel C compiler found in PATH and CC is unset." "$LINENO" 5
     
    34333470  fi
    34343471
    3435   # look for some C compiler and check whether it works
    3436   # if user has set CC or we found icl/cl above, this shouldn't overwrite CC
    3437   # other than CXX of F77, this macro also takes care of adding the compile-wrapper
     3472  # Look for some C compiler and check that it works. If the user has set CC
     3473  # or we found icl/cl above, this shouldn't overwrite CC. Unlike the macros
     3474  # that establish C++ or Fortran compilers, PROG_CC also takes care of adding
     3475  # the compile wrapper if needed.
     3476
    34383477  ac_ext=c
    34393478ac_cpp='$CPP $CPPFLAGS'
     
    42214260
    42224261
     4262  # Declare precious variable for additional compiler flags
     4263
     4264
    42234265
    42244266# Get the name of the Fortran compiler and appropriate compiler options
     
    45594601    fi
    45604602  fi
     4603
     4604  # Declare precious variable for additional compiler flags
     4605
    45614606
    45624607
     
    1598916034#    regarding those that are properly marked for dll-export in the source.
    1599016035#
    15991 # Patch libtool also to circumbent some issues when using MinGW (Msys+GCC).
     16036# Patch libtool also to circumvent some issues when using MinGW (Msys+GCC).
    1599216037# 1. Relax check which libraries can be used when linking a DLL.
    1599316038#    libtool's func_mode_link() would reject linking MinGW system libraries,
     
    1601216057  esac
    1601316058
    16014   # Set up LT_LDFLAGS.
     16059  # Set up LT_LDFLAGS, user can initialize and we augment below
    1601516060
    1601616061
     
    1805618101  fi
    1805718102
     18103if test $coin_has_lapack != yes; then
     18104  as_fn_error $? "Required package LAPACK not found." "$LINENO" 5
     18105fi
    1805818106
    1805918107
     
    1853718585if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
    1853818586  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
     18587Usually this means the macro was only invoked conditionally." "$LINENO" 5
     18588fi
     18589if test -z "${COIN_RELOCATABLE_TRUE}" && test -z "${COIN_RELOCATABLE_FALSE}"; then
     18590  as_fn_error $? "conditional \"COIN_RELOCATABLE\" was never defined.
    1853918591Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1854018592fi
  • ThirdParty/Mumps/stable/2.0/configure.ac

    r4034 r4116  
    7777
    7878AC_COIN_CHK_LAPACK(MUMPS)
     79if test $coin_has_lapack != yes; then
     80  AC_MSG_ERROR([Required package LAPACK not found.])
     81fi
    7982
    8083AC_COIN_CHK_PKG(Metis,[MUMPS],[coinmetis],[build])
  • ThirdParty/Mumps/stable/2.0/get.Mumps

    r3813 r4116  
    2828rm -f MUMPS*.tgz
    2929
    30 echo "Downloading the source code from ..."
    31 $wgetcmd http://mumps.enseeiht.fr/MUMPS_${mumps_ver}.tar.gz
     30echo "Downloading the source code from coin-or-tools.github.io..."
     31if $wgetcmd http://coin-or-tools.github.io/ThirdParty-Mumps/MUMPS_${mumps_ver}.tar.gz ;
     32then
     33  echo "Download finished."
     34else
     35  echo
     36  echo "Downloading from GitHub failed, trying mumps.enseeiht.fr..."
     37  if $wgetcmd http://mumps.enseeiht.fr/MUMPS_${mumps_ver}.tar.gz ;
     38  then
     39    echo "Download finished."
     40  else
     41    echo "Download failed...exiting"
     42  fi
     43fi
    3244
    3345echo "Uncompressing the tarball..."
Note: See TracChangeset for help on using the changeset viewer.