Changeset 129985


Ignore:
Timestamp:
Dec 24, 2014, 12:42:39 AM (5 years ago)
Author:
sean@…
Message:

mpi-1.0: remove mpi.choose

This variable never worked correctly and caused mpi ports to wrongly list
fortran variants when only a c/cxx compiler was needed. So, we use
compilers.choose now.

Location:
trunk/dports
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/_resources/port1.0/group/mpi-1.0.tcl

    r127403 r129985  
    4343default mpi.required_variants {}
    4444
    45 set mpi.list {cc cxx f77 f90 fc}
    4645set mpi.cc   mpicc
    4746set mpi.cxx  mpicxx
     
    119118                    set mpi.fc mpif90-$mpidb($variant,name)-\$p_name
    120119
    121                     foreach compiler \${mpi.list} {
     120                    foreach compiler \${compilers.list} {
    122121                        if {\$compiler ne "fc"} {
    123122                            configure.\$compiler \${prefix}/bin/mpi\${compiler}-$mpidb($variant,name)-\$p_name
    124123                        }
    125124                    }
    126                     if {[lsearch -exact \${mpi.list} fc]} {
     125                    if {[lsearch -exact \${compilers.list} fc]} {
    127126                        set configure.fc \${prefix}/bin/mpif90-$mpidb($variant,name)-\$p_name
    128127                    }
     
    199198proc mpi_variant_isset {} {
    200199    return [expr {[mpi_variant_name] ne ""}]
    201 }
    202 
    203 proc mpi.choose {args} {
    204     global mpi.list
    205 
    206     # zero out the variable before and append args
    207     set mpi.list {}
    208     foreach v $args {
    209         lappend mpi.list $v
    210     }
    211200}
    212201
  • trunk/dports/devel/GASNet/Portfile

    r128618 r129985  
    55
    66PortGroup           mpi 1.0
    7 mpi.choose          cc
     7compilers.choose    cc
    88mpi.setup           require -clang -dragonegg -g95 -gfortran -llvm
    99
  • trunk/dports/devel/valgrind/Portfile

    r129034 r129985  
    2323
    2424compilers.choose    cc cxx
    25 mpi.choose
    2625mpi.setup           -gcc44 -gcc45 -gcc46
    2726
  • trunk/dports/lang/berkeley_upc/Portfile

    r121955 r129985  
    2323
    2424compilers.choose    cc cxx
    25 mpi.choose
    2625mpi.setup
    2726
  • trunk/dports/lang/omnicompiler/Portfile

    r128675 r129985  
    3232use_bzip2           yes
    3333
    34 mpi.choose          cc fc
     34compilers.choose    cc fc
    3535mpi.setup           require -clang -dragonegg -g95 -gfortran -llvm
    3636if {[variant_isset coarray]} {
  • trunk/dports/math/fftw-3/Portfile

    r128279 r129985  
    5252# don't change configure.cc, etc. since we'll take care of that manually with
    5353# MPICC env var
    54 mpi.choose
    5554mpi.setup
    5655
  • trunk/dports/math/fftw/Portfile

    r121955 r129985  
    3535# don't change configure.cc, etc. since we'll take care of that manually with
    3636# MPICC env var
    37 mpi.choose
    3837mpi.setup           require_fortran
    3938
  • trunk/dports/math/gnudatalanguage/Portfile

    r126652 r129985  
    1313
    1414compilers.choose            cc cxx
    15 mpi.choose
    1615mpi.setup                   -openmpi -openmpi_devel -dragonegg
    1716
  • trunk/dports/math/optpp/Portfile

    r121955 r129985  
    2222
    2323compilers.choose cc cxx
    24 mpi.choose
    2524mpi.setup
    2625
  • trunk/dports/math/plda/Portfile

    r121955 r129985  
    2525
    2626compilers.choose    cc cxx
    27 mpi.choose
    2827mpi.setup
    2928
  • trunk/dports/python/py-scientific/Portfile

    r126071 r129985  
    2424
    2525compilers.choose    cc cxx
    26 mpi.choose
    2726mpi.setup
    2827
  • trunk/dports/science/apbs/Portfile

    r128656 r129985  
    6666    }
    6767    apbs-mpi {
    68         mpi.choose
    6968        mpi.setup               require
    7069
  • trunk/dports/science/cdo/Portfile

    r129586 r129985  
    2525fetch.ignore_sslcert        yes
    2626
    27 mpi.choose                  cc
     27compilers.choose            cc
    2828mpi.setup                   -clang -dragonegg
    2929mpi.enforce_variant         hdf5
  • trunk/dports/science/hdfeos5/Portfile

    r128942 r129985  
    2828                    rmd160  34df5cdb6bdc4d06a7658d38aae6fed0b5671557
    2929
    30 mpi.choose          cc cxx
    31 mpi.setup           -clang -dragonegg -g95 -gfortran -llvm
     30compilers.choose    cc cxx
     31mpi.setup           -clang -dragonegg -llvm
    3232mpi.enforce_variant hdf5
    3333
Note: See TracChangeset for help on using the changeset viewer.