Ignore:
Timestamp:
Sep 9, 2015, 9:26:57 PM (3 years ago)
Author:
sean@…
Message:

compilers-1.0: rename gfortran_equiv to gcc_default to be used in upcoming patch

File:
1 edited

Legend:

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

    r140088 r140089  
    5252default compilers.required_c {}
    5353default compilers.required_f {}
     54
     55# also set a default gcc version
     56set compilers.gcc_default gcc49
    5457
    5558set compilers.list {cc cxx cpp objc fc f77 f90}
     
    145148# and lastly we add a gfortran and g95 variant for use with clang* and llvm; note that
    146149# we don't need gfortran when we are in an "only-fortran" mode
    147 set compilers.gfortran_equiv    gcc49
    148150set cdb(gfortran,variant)  gfortran
    149151set cdb(gfortran,compiler) gfortran
    150152set cdb(gfortran,descrip)  "Fortran compiler from gcc49"
    151 set cdb(gfortran,depends)  $cdb(${compilers.gfortran_equiv},depends)
    152 set cdb(gfortran,dependsl) $cdb(${compilers.gfortran_equiv},dependsl)
    153 set cdb(gfortran,dependsd) $cdb(${compilers.gfortran_equiv},dependsd)
    154 set cdb(gfortran,dependsa) $cdb(${compilers.gfortran_equiv},dependsa)
    155 set cdb(gfortran,conflict) $cdb(${compilers.gfortran_equiv},conflict)
     153set cdb(gfortran,depends)  $cdb(${compilers.gcc_default},depends)
     154set cdb(gfortran,dependsl) $cdb(${compilers.gcc_default},dependsl)
     155set cdb(gfortran,dependsd) $cdb(${compilers.gcc_default},dependsd)
     156set cdb(gfortran,dependsa) $cdb(${compilers.gcc_default},dependsa)
     157set cdb(gfortran,conflict) $cdb(${compilers.gcc_default},conflict)
    156158set cdb(gfortran,cc)       ""
    157159set cdb(gfortran,cxx)      ""
    158160set cdb(gfortran,cpp)      ""
    159161set cdb(gfortran,objc)     ""
    160 set cdb(gfortran,fc)       $cdb(${compilers.gfortran_equiv},fc)
    161 set cdb(gfortran,f77)      $cdb(${compilers.gfortran_equiv},f77)
    162 set cdb(gfortran,f90)      $cdb(${compilers.gfortran_equiv},f90)
     162set cdb(gfortran,fc)       $cdb(${compilers.gcc_default},fc)
     163set cdb(gfortran,f77)      $cdb(${compilers.gcc_default},f77)
     164set cdb(gfortran,f90)      $cdb(${compilers.gcc_default},f90)
    163165
    164166set cdb(g95,variant)  g95
     
    461463
    462464proc compilers.action_enforce_f {args} {
    463     global compilers.gfortran_equiv
     465    global compilers.gcc_default
    464466    foreach portname $args {
    465467        if {![catch {set result [active_variants $portname "" ""]}]} {
     
    469471            # gfortran is nothing more than the fortran compiler from a default version of gcc
    470472            set equiv 0
    471             if {($otf eq ${compilers.gfortran_equiv} || $otf eq "gfortran") &&
    472                 ($myf eq ${compilers.gfortran_equiv} || $myf eq "gfortran")} {
     473            if {($otf eq ${compilers.gcc_default} || $otf eq "gfortran") &&
     474                ($myf eq ${compilers.gcc_default} || $myf eq "gfortran")} {
    473475                set equiv 1
    474476            }
Note: See TracChangeset for help on using the changeset viewer.