Changeset 3984


Ignore:
Timestamp:
Sep 4, 2019 11:44:05 AM (6 weeks ago)
Author:
stefan
Message:

add OPENMP_FCFLAGS to HSL_LFLAGS, too

  • this avoids undefined references to OpenMP when building the HSL DLL under MinGW
  • should then no longer be necessary to pass this on via Cflags
  • fingers crossed
Location:
ThirdParty/HSL/branches/autotools-update
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/branches/autotools-update/Makefile.in

    r3976 r3984  
    290290CCDEPMODE = @CCDEPMODE@
    291291CFLAGS = @CFLAGS@
    292 COINHSL_SVN_REV = @COINHSL_SVN_REV@
    293292COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    294293CPP = @CPP@
     
    385384dvidir = @dvidir@
    386385exec_prefix = @exec_prefix@
    387 have_svnversion = @have_svnversion@
    388386host = @host@
    389387host_alias = @host_alias@
  • ThirdParty/HSL/branches/autotools-update/coinhsl.pc.in

    r3969 r3984  
    1010Libs: -L${libdir} -lcoinhsl
    1111Libs.private: @HSL_LFLAGS_NOPC@
    12 Cflags: -I${includedir} @OPENMP_FCFLAGS@
     12Cflags: -I${includedir}
    1313Requires.private: @HSL_PCFILES@
  • ThirdParty/HSL/branches/autotools-update/config.h.in

    r3965 r3984  
    2727/* Define to 1 if METIS is available */
    2828#undef COINHSL_HAS_METIS
    29 
    30 /* SVN revision number of project */
    31 #undef COINHSL_SVN_REV
    3229
    3330/* Version number of project */
  • ThirdParty/HSL/branches/autotools-update/configure

    r3983 r3984  
    766766ALWAYS_FALSE_FALSE
    767767ALWAYS_FALSE_TRUE
    768 COINHSL_SVN_REV
    769 have_svnversion
    770768target_alias
    771769host_alias
     
    14651463  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    14661464  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    1467   --enable-msvc           Look for and allow only Intel/Microsoft compilers on
    1468                           MinGW/MSys/Cygwin.
    1469   --enable-debug          Build with debugging symbols.
     1465  --enable-msvc           look for and allow only Intel/Microsoft compilers on
     1466                          MinGW/MSys/Cygwin
     1467  --enable-debug          build debugging symbols and turn off compiler
     1468                          optimization
    14701469  --enable-silent-rules   less verbose build output (undo: "make V=1")
    14711470  --disable-silent-rules  verbose build output (undo: "make V=0")
     
    24252424
    24262425
     2426  # We want --enable-msvc setup and checked
     2427
     2428
    24272429  # Check whether --enable-debug was given.
    24282430if test "${enable_debug+set}" = set; then :
     
    24312433  enable_debug=no
    24322434fi
    2433 
    2434 
    2435 
    2436 # We want --enable-msvc setup and checked. Also --enable-debug
    2437 
    2438 
    24392435
    24402436
     
    30153011
    30163012
     3013  # break up package version number in major.minor.release
     3014  # AC_PACKAGE_VERSION is defined by AC_INIT
     3015
     3016
     3017
     3018
     3019  # ac-define AC_PACKAGE_VERSION macros, use 9999 for missing values
    30173020
    30183021cat >>confdefs.h <<_ACEOF
    3019 #define COINHSL_VERSION "$PACKAGE_VERSION"
     3022#define COINHSL_VERSION "trunk"
    30203023_ACEOF
    30213024
    30223025
    3023 # Parse package version, assuming major.minor.release. PACKAGE_VERSION is set
    3024 # by AC_INIT. Force components to 9999 if they're empty; this deals with
    3025 # things like `trunk' and other nonstandard forms.
    3026 
    3027   coin_majorver=`echo $PACKAGE_VERSION | sed -n -e 's/^\([0-9]*\).*/\1/gp'`
    3028   coin_minorver=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.\([0-9]*\).*/\1/gp'`
    3029   coin_releasever=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*/\1/gp'`
    3030   test -z "$coin_majorver"   && coin_majorver=9999
    3031   test -z "$coin_minorver"   && coin_minorver=9999
    3032   test -z "$coin_releasever" && coin_releasever=9999
    3033 
    30343026cat >>confdefs.h <<_ACEOF
    3035 #define COINHSL_VERSION_MAJOR $coin_majorver
     3027#define COINHSL_VERSION_MAJOR 9999
    30363028_ACEOF
    30373029
    30383030
    30393031cat >>confdefs.h <<_ACEOF
    3040 #define COINHSL_VERSION_MINOR $coin_minorver
     3032#define COINHSL_VERSION_MINOR 9999
    30413033_ACEOF
    30423034
    30433035
    30443036cat >>confdefs.h <<_ACEOF
    3045 #define COINHSL_VERSION_RELEASE $coin_releasever
     3037#define COINHSL_VERSION_RELEASE 9999
    30463038_ACEOF
    30473039
    30483040
    3049 # Create a variable set to the upper case version of the project name
    3050 
    3051   COIN_PRJCT=COINHSL
    3052 
    3053 # Set the project's SVN revision number. The complicated sed expression
    3054 # (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
    3055 # as a single number.
    3056 
    3057   # Extract the first word of "svnversion", so it can be a program name with args.
    3058 set dummy svnversion; ac_word=$2
    3059 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    3060 $as_echo_n "checking for $ac_word... " >&6; }
    3061 if ${ac_cv_prog_have_svnversion+:} false; then :
    3062   $as_echo_n "(cached) " >&6
    3063 else
    3064   if test -n "$have_svnversion"; then
    3065   ac_cv_prog_have_svnversion="$have_svnversion" # Let the user override the test.
    3066 else
    3067 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    3068 for as_dir in $PATH
    3069 do
    3070   IFS=$as_save_IFS
    3071   test -z "$as_dir" && as_dir=.
    3072     for ac_exec_ext in '' $ac_executable_extensions; do
    3073   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    3074     ac_cv_prog_have_svnversion="yes"
    3075     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    3076     break 2
    3077   fi
    3078 done
    3079   done
    3080 IFS=$as_save_IFS
    3081 
    3082   test -z "$ac_cv_prog_have_svnversion" && ac_cv_prog_have_svnversion="no"
    3083 fi
    3084 fi
    3085 have_svnversion=$ac_cv_prog_have_svnversion
    3086 if test -n "$have_svnversion"; then
    3087   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_svnversion" >&5
    3088 $as_echo "$have_svnversion" >&6; }
    3089 else
    3090   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    3091 $as_echo "no" >&6; }
    3092 fi
    3093 
    3094 
    3095   if test "x$have_svnversion" = xyes; then
    3096 
    3097     svn_rev_tmp=`LANG=en_EN svnversion $srcdir 2>/dev/null`
    3098     if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x -a "x$svn_rev_tmp" != "xUnversioned directory"; then
    3099       COINHSL_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    3100 
    3101 cat >>confdefs.h <<_ACEOF
    3102 #define COINHSL_SVN_REV $COINHSL_SVN_REV
    3103 _ACEOF
    3104 
    3105     fi
    3106   fi
    3107 
    3108 
    3109 
    3110 # Capture the libtool library version, if given.
     3041
    31113042
    31123043
     
    92739204
    92749205
    9275 
    9276 # (lh, 180302) Sadly, we can't use the obvious libtool macros
    9277 # (AC_{ENABLE,DISABLE}_{SHARED,STATIC}, nor parameters to LT_INIT,
    9278 # precisely because these macros record the default behaviour by defining
    9279 # a macro, _LT_ENABLE_{SHARED,STATIC}_DEFAULT. No shell code involved, hence
    9280 # any shell conditional has no effect. Either we trust libtool or we need
    9281 # something more inventive. The relevant libtool macros are in ltoptions.m4,
    9282 # _LT_ENABLE_SHARED and _LT_ENABLE_STATIC.
    9283 # That is, something like the following will not work:
    9284 # case $host_os in
    9285 #   cygwin* | mingw* | msys* ) AC_DISABLE_SHARED  ;;
    9286 #   *) AC_DISABLE_STATIC ;;
    9287 # esac
    92889206
    92899207# Create libtool.
     
    1971619634#    and explicitly dll-exporting them, leading to warnings about duplicates
    1971719635#    regarding those that are properly marked for dll-export in the source.
     19636#
     19637# Patch libtool also to circumbent some issues when using MinGW (Msys+GCC).
     19638# 1. Relax check which libraries can be used when linking a DLL.
     19639#    libtool's func_mode_link() would reject linking MinGW system libraries,
     19640#    e.g., -lmingw32, when building a DLL, because it does not find this
     19641#    library in the installation path, and then falls back to build only
     19642#    static libraries. Setting deplibs_check_method=pass_all will avoid
     19643#    this faulty check.
    1971819644
    1971919645  case "$AR" in
    1972019646    *lib* | *LIB* )
    19721       ac_config_commands="$ac_config_commands libtoolpatch"
    19722 
     19647      ac_config_commands="$ac_config_commands libtoolclpatch"
     19648
     19649      ;;
     19650    * )
     19651      case $build in
     19652        *-mingw* )
     19653          ac_config_commands="$ac_config_commands libtoolmingwpatch"
     19654
     19655        ;;
     19656      esac
    1972319657      ;;
    1972419658  esac
    1972519659
    19726 # Set up LT_LDFLAGS. Add the library version string to LT_LDFLAGS, if one
    19727 # is supplied.
    19728 
    19729 
    19730   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the library version is set" >&5
    19731 $as_echo_n "checking if the library version is set... " >&6; }
    19732   if test x"$coin_libversion" != x ; then
    19733     LT_LDFLAGS="$LT_LDFLAGS -version-info $coin_libversion"
    19734     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_libversion" >&5
    19735 $as_echo "$coin_libversion" >&6; }
    19736   else
    19737     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    19738 $as_echo "no" >&6; }
    19739   fi
     19660  # Set up LT_LDFLAGS.
     19661
     19662
     19663  # Use the libtool library info, if defined, otherwise use the project version info,
     19664  # if a full major.minor.release number was available
     19665
    1974019666
    1974119667  # shared libraries should have no undefined symbols
     
    2157521501
    2157621502  FCFLAGS="$FCFLAGS $OPENMP_FCFLAGS"
     21503  HSL_LFLAGS="$HSL_LFLAGS $OPENMP_FCFLAGS"
    2157721504  ac_ext=c
    2157821505ac_cpp='$CPP $CPPFLAGS'
     
    2290822835    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2290922836    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
    22910     "libtoolpatch") CONFIG_COMMANDS="$CONFIG_COMMANDS libtoolpatch" ;;
     22837    "libtoolclpatch") CONFIG_COMMANDS="$CONFIG_COMMANDS libtoolclpatch" ;;
     22838    "libtoolmingwpatch") CONFIG_COMMANDS="$CONFIG_COMMANDS libtoolmingwpatch" ;;
    2291122839    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    2291222840    "coinhsl.pc") CONFIG_FILES="$CONFIG_FILES coinhsl.pc" ;;
     
    2446524393
    2446624394 ;;
    24467     "libtoolpatch":C) sed -e 's|AR_FLAGS |AR_FLAGS|g' \
     24395    "libtoolclpatch":C) sed -e 's|AR_FLAGS |AR_FLAGS|g' \
    2446824396             -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' \
    2446924397             -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
     
    2447224400         mv libtool.tmp libtool
    2447324401         chmod 755 libtool ;;
     24402    "libtoolmingwpatch":C) sed -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' libtool > libtool.tmp
     24403             mv libtool.tmp libtool
     24404             chmod 755 libtool ;;
    2447424405
    2447524406  esac
     
    2451124442
    2451224443
    24513   { $as_echo "$as_me:${as_lineno-$LINENO}: In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting" >&5
    24514 $as_echo "$as_me: In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting" >&6;}
     24444  #AC_MSG_NOTICE([In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting])
    2451524445  { $as_echo "$as_me:${as_lineno-$LINENO}: Configuration of $PACKAGE_NAME successful" >&5
    2451624446$as_echo "$as_me: Configuration of $PACKAGE_NAME successful" >&6;}
    2451724447
    24518 
  • ThirdParty/HSL/branches/autotools-update/configure.ac

    r3969 r3984  
    140140  AC_OPENMP
    141141  FCFLAGS="$FCFLAGS $OPENMP_FCFLAGS"
     142  HSL_LFLAGS="$HSL_LFLAGS $OPENMP_FCFLAGS"
    142143  AC_LANG_POP(Fortran)
    143144fi
Note: See TracChangeset for help on using the changeset viewer.