Ticket #32542: auto-compiler-deps.4.diff

macports1.0/macports.tcl

@@ -1617 +1617 @@
         error "Error evaluating variants"
     }
 
+    $workername eval port::run_callbacks
+
     ditem_key $mport provides [$workername eval return \$subport]
 
     return $mport

port1.0/port.tcl

@@ -32 +32 @@
 # standard package load
 package provide port 1.0
 
+# Provide a callback registration mechanism for port subpackages. This needs to
+# be done _before_ loading the subpackages.
+namespace eval port {}
+set port::_callback_list [list]
+
+# Append a new procedure to a list of callbacks to be called when
+# port::run_callbacks is called from macports1.0 after evaluating a Portfile
+proc port::register_callback {callback} {
+        global port::_callback_list
+
+        lappend _callback_list ${callback}
+}
+
+# Run the callbacks registered in the callback list. Called from macports1.0 in
+# the child interpreter after evaluating the Portfile and the variants. Clears
+# the list of callbacks.
+proc port::run_callbacks {} {
+        global port::_callback_list
+
+        ui_debug "Running callbacks..."
+
+        foreach callback ${_callback_list} {
+                ui_debug "Running callback ${callback}"
+                ${callback}
+                ui_debug "Finished running callback ${callback}"
+        }
+        set _callback_list [list]
+}
+
 package require mp_package 1.0
 package require portmain 1.0
 package require portdepends 1.0

port1.0/portconfigure.tcl

@@ -757 +757 @@
     return $ret
 }
 
+# Automatically called from macports1.0 after evaluating the Portfile
+# Some of the compilers we use are provided by MacPorts itself; ensure we
+# automatically add a dependency when needed
+proc portconfigure::add_automatic_compiler_dependencies {} {
+    global configure.compiler portconfigure::compiler_name_map
+
+    # The default value requires substitution before use.
+    set compiler [subst ${configure.compiler}]
+    if {![compiler_is_port $compiler]} {
+        return
+    }
+
+    ui_debug "Chosen compiler ${compiler} is provided by a port, adding dependency"
+
+    set compiler_port $compiler_name_map($compiler)
+    if {[string first "macports-gcc-" $compiler] == 0} {
+        ui_debug "  Adding depends_lib port:$compiler_port"
+        depends_lib-append port:$compiler_port
+    } else {
+        ui_debug "  Adding depends_build port:$compiler_port"
+        depends_build-append port:$compiler_port
+    }
+
+    if {[arch_flag_supported $compiler]} {
+        ui_debug "  Adding depends_skip_archcheck port:$compiler_port"
+        depends_skip_archcheck-append $compiler_port
+    }
+}
+# Register the above procedure as a callback after Portfile evaluation
+port::register_callback portconfigure::add_automatic_compiler_dependencies
+
 proc portconfigure::configure_main {args} {
     global [info globals]
     global worksrcpath use_configure use_autoreconf use_autoconf use_automake use_xmkmf