[131848] trunk/dports/_resources/port1.0/group/compilers-1.0.tcl

[dstrubbe at macports.org]

Revision: 131848
          https://trac.macports.org/changeset/131848
Author:   dstrubbe at macports.org
Date:     2015-01-19 15:59:01 -0800 (Mon, 19 Jan 2015)
Log 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.

Revision Links:
--------------
    https://trac.macports.org/changeset/131739

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/compilers-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/compilers-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/compilers-1.0.tcl	2015-01-19 23:43:32 UTC (rev 131847)
+++ trunk/dports/_resources/port1.0/group/compilers-1.0.tcl	2015-01-19 23:59:01 UTC (rev 131848)
@@ -131,22 +131,22 @@
 
 # and lastly we add a gfortran and g95 variant for use with clang*; note that
 # we don't need gfortran when we are in an "only-fortran" mode
-set gfortran_equiv gcc49
+set compilers.gfortran_equiv    gcc49
 set cdb(gfortran,variant)  gfortran
-set cdb(gfortran,compiler) $cdb($gfortran_equiv,compiler)
-set cdb(gfortran,descrip)  $cdb($gfortran_equiv,descrip)
-set cdb(gfortran,depends)  $cdb($gfortran_equiv,depends)
-set cdb(gfortran,dependsl) $cdb($gfortran_equiv,dependsl)
-set cdb(gfortran,dependsd) $cdb($gfortran_equiv,dependsd)
-set cdb(gfortran,dependsa) $cdb($gfortran_equiv,dependsa)
-set cdb(gfortran,conflict) $cdb($gfortran_equiv,conflict)
-set cdb(gfortran,cc)       $cdb($gfortran_equiv,cc)
-set cdb(gfortran,cxx)      $cdb($gfortran_equiv,cxx)
-set cdb(gfortran,cpp)      $cdb($gfortran_equiv,cpp)
-set cdb(gfortran,objc)     $cdb($gfortran_equiv,objc)
-set cdb(gfortran,fc)       $cdb($gfortran_equiv,fc)
-set cdb(gfortran,f77)      $cdb($gfortran_equiv,f77)
-set cdb(gfortran,f90)      $cdb($gfortran_equiv,f90)
+set cdb(gfortran,compiler) $cdb(${compilers.gfortran_equiv},compiler)
+set cdb(gfortran,descrip)  $cdb(${compilers.gfortran_equiv},descrip)
+set cdb(gfortran,depends)  $cdb(${compilers.gfortran_equiv},depends)
+set cdb(gfortran,dependsl) $cdb(${compilers.gfortran_equiv},dependsl)
+set cdb(gfortran,dependsd) $cdb(${compilers.gfortran_equiv},dependsd)
+set cdb(gfortran,dependsa) $cdb(${compilers.gfortran_equiv},dependsa)
+set cdb(gfortran,conflict) $cdb(${compilers.gfortran_equiv},conflict)
+set cdb(gfortran,cc)       $cdb(${compilers.gfortran_equiv},cc)
+set cdb(gfortran,cxx)      $cdb(${compilers.gfortran_equiv},cxx)
+set cdb(gfortran,cpp)      $cdb(${compilers.gfortran_equiv},cpp)
+set cdb(gfortran,objc)     $cdb(${compilers.gfortran_equiv},objc)
+set cdb(gfortran,fc)       $cdb(${compilers.gfortran_equiv},fc)
+set cdb(gfortran,f77)      $cdb(${compilers.gfortran_equiv},f77)
+set cdb(gfortran,f90)      $cdb(${compilers.gfortran_equiv},f90)
 
 set cdb(g95,variant)  g95
 set cdb(g95,compiler) g95
@@ -446,6 +446,7 @@
 }
 
 proc compilers.action_enforce_f {args} {
+    global compilers.gfortran_equiv
     foreach portname $args {
         if {![catch {set result [active_variants $portname "" ""]}]} {
             set otf  [fortran_active_variant_name $portname]
@@ -453,7 +454,8 @@
 
             # gfortran is nothing more than the fortran compiler from a default version of gcc
             set equiv 0
-            if {($otf eq $gfortran_equiv || $otf eq "gfortran") && ($myf eq $gfortran_equiv || $myf eq "gfortran")} {
+            if {($otf eq ${compilers.gfortran_equiv} || $otf eq "gfortran") &&
+                ($myf eq ${compilers.gfortran_equiv} || $myf eq "gfortran")} {
                 set equiv 1
             }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150119/87abe687/attachment.html>