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

[sean at macports.org]

Revision: 118763
          https://trac.macports.org/changeset/118763
Author:   sean at macports.org
Date:     2014-04-10 17:12:36 -0700 (Thu, 10 Apr 2014)
Log Message:
-----------
compilers-1.0: move enforce procs into pre-fetch to avoid parse errors

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	2014-04-10 20:46:01 UTC (rev 118762)
+++ trunk/dports/_resources/port1.0/group/compilers-1.0.tcl	2014-04-11 00:12:36 UTC (rev 118763)
@@ -46,6 +46,8 @@
 default compilers.dragonegg_variants {}
 default compilers.require_fortran 0
 default compilers.setup_done 0
+default compilers.required_c {}
+default compilers.required_f {}
 
 set compilers.list {cc cxx cpp objc fc f77 f90}
 
@@ -454,6 +456,11 @@
 
 # for the c compiler
 proc compilers.enforce_c {args} {
+    global compilers.required_c
+    set compilers.required_c $args
+}
+
+proc compilers.action_enforce_c {args} {
     foreach portname $args {
         if {![catch {set result [active_variants $portname "" ""]}]} {
             set otcomp  [c_active_variant_name $portname]
@@ -470,6 +477,11 @@
 }
 
 proc compilers.enforce_fortran {args} {
+    global compilers.required_f
+    set compilers.required_f $args
+}
+
+proc compilers.action_enforce_f {args} {
     foreach portname $args {
         if {![catch {set result [active_variants $portname "" ""]}]} {
             set otf  [fortran_active_variant_name $portname]
@@ -568,8 +580,11 @@
     }
 }
 
+# this might also need to be in pre-archivefetch
 pre-fetch {
     if {${compilers.require_fortran} && [fortran_variant_name] eq ""} {
         return -code error "must set at least one fortran variant"
     }
+    eval compilers.action_enforce_c ${compilers.required_c}
+    eval compilers.action_enforce_f ${compilers.required_f}
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140410/c034c4fc/attachment.html>