Ignore:
Timestamp:
Jan 19, 2015, 11:59:01 PM (4 years ago)
Author:
dstrubbe@…
Message:

compilers PortGroup: Correct use of variable for +gfortran variant so that compilers.enforce_fortran does not fail with an error. Bugfix to my r131739.

File:
1 edited

Legend:

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

    r131739 r131848  
    132132# and lastly we add a gfortran and g95 variant for use with clang*; note that
    133133# we don't need gfortran when we are in an "only-fortran" mode
    134 set gfortran_equiv gcc49
     134set compilers.gfortran_equiv    gcc49
    135135set cdb(gfortran,variant)  gfortran
    136 set cdb(gfortran,compiler) $cdb($gfortran_equiv,compiler)
    137 set cdb(gfortran,descrip)  $cdb($gfortran_equiv,descrip)
    138 set cdb(gfortran,depends)  $cdb($gfortran_equiv,depends)
    139 set cdb(gfortran,dependsl) $cdb($gfortran_equiv,dependsl)
    140 set cdb(gfortran,dependsd) $cdb($gfortran_equiv,dependsd)
    141 set cdb(gfortran,dependsa) $cdb($gfortran_equiv,dependsa)
    142 set cdb(gfortran,conflict) $cdb($gfortran_equiv,conflict)
    143 set cdb(gfortran,cc)       $cdb($gfortran_equiv,cc)
    144 set cdb(gfortran,cxx)      $cdb($gfortran_equiv,cxx)
    145 set cdb(gfortran,cpp)      $cdb($gfortran_equiv,cpp)
    146 set cdb(gfortran,objc)     $cdb($gfortran_equiv,objc)
    147 set cdb(gfortran,fc)       $cdb($gfortran_equiv,fc)
    148 set cdb(gfortran,f77)      $cdb($gfortran_equiv,f77)
    149 set cdb(gfortran,f90)      $cdb($gfortran_equiv,f90)
     136set cdb(gfortran,compiler) $cdb(${compilers.gfortran_equiv},compiler)
     137set cdb(gfortran,descrip)  $cdb(${compilers.gfortran_equiv},descrip)
     138set cdb(gfortran,depends)  $cdb(${compilers.gfortran_equiv},depends)
     139set cdb(gfortran,dependsl) $cdb(${compilers.gfortran_equiv},dependsl)
     140set cdb(gfortran,dependsd) $cdb(${compilers.gfortran_equiv},dependsd)
     141set cdb(gfortran,dependsa) $cdb(${compilers.gfortran_equiv},dependsa)
     142set cdb(gfortran,conflict) $cdb(${compilers.gfortran_equiv},conflict)
     143set cdb(gfortran,cc)       $cdb(${compilers.gfortran_equiv},cc)
     144set cdb(gfortran,cxx)      $cdb(${compilers.gfortran_equiv},cxx)
     145set cdb(gfortran,cpp)      $cdb(${compilers.gfortran_equiv},cpp)
     146set cdb(gfortran,objc)     $cdb(${compilers.gfortran_equiv},objc)
     147set cdb(gfortran,fc)       $cdb(${compilers.gfortran_equiv},fc)
     148set cdb(gfortran,f77)      $cdb(${compilers.gfortran_equiv},f77)
     149set cdb(gfortran,f90)      $cdb(${compilers.gfortran_equiv},f90)
    150150
    151151set cdb(g95,variant)  g95
     
    447447
    448448proc compilers.action_enforce_f {args} {
     449    global compilers.gfortran_equiv
    449450    foreach portname $args {
    450451        if {![catch {set result [active_variants $portname "" ""]}]} {
     
    454455            # gfortran is nothing more than the fortran compiler from a default version of gcc
    455456            set equiv 0
    456             if {($otf eq $gfortran_equiv || $otf eq "gfortran") && ($myf eq $gfortran_equiv || $myf eq "gfortran")} {
     457            if {($otf eq ${compilers.gfortran_equiv} || $otf eq "gfortran") &&
     458                ($myf eq ${compilers.gfortran_equiv} || $myf eq "gfortran")} {
    457459                set equiv 1
    458460            }
Note: See TracChangeset for help on using the changeset viewer.