Ticket #32542: auto-compiler-deps.diff

trunk/base/src/port1.0/portconfigure.tcl

@@ -2 +2 @@
 # portconfigure.tcl
 # $Id$
 #
-# Copyright (c) 2007 - 2012 The MacPorts Project
+# Copyright (c) 2007 - 2013 The MacPorts Project
 # Copyright (c) 2007 Markus W. Weissmann <mww@macports.org>
 # Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
@@ -190 +190 @@
 default compiler.fallback       {[portconfigure::get_compiler_fallback]}
 default compiler.blacklist      {}
 default compiler.whitelist      {}
+option_proc configure.compiler portconfigure::set_compiler_dependencies
 
 set_ui_prefix
 
@@ -388 +389 @@
 
 # check if a compiler comes from a port
 proc portconfigure::compiler_is_port {compiler} {
-    switch $compiler {
-        clang -
-        llvm-gcc-4.2 -
-        gcc-4.2 -
-        gcc-4.0 -
-        gcc-3.3 {return no}
-        default {return yes}
-    }
+    return [info exists portconfigure::compiler_name_map(${compiler})]
 }
 
 # maps compiler names to the port that provides them
@@ -421 +415 @@
         macports-dragonegg-3.3  dragonegg-3.3
 }
 
+# Add required dependencies when setting compiler.
+proc portconfigure::set_compiler_dependencies {option action args} {
+    # Lazily process default value on first read only; if default is
+    # overriden, update dependencies on writes instead of reads.
+    if {[string equal "read" ${action}] &&
+            (![info exists ::option_defaults(configure.compiler)] ||
+             [info exists portconfigure::compiler_port])
+    } then {
+        return
+    }
+
+    if {[info exists portconfigure::compiler_port]} {
+        depends_lib-delete port:${portconfigure::compiler_port}
+        depends_build-delete port:${portconfigure::compiler_port}
+        depends_skip_archcheck-delete ${portconfigure::compiler_port}
+    }
+
+    # Default value must be substituted before use.
+    set compiler [subst ${::configure.compiler}]
+    if {![portconfigure::compiler_is_port ${compiler}]} {
+        return
+    }
+    variable compiler_port $portconfigure::compiler_name_map(${compiler})
+    if {[string match "macports-gcc*" ${compiler}]} {
+        depends_lib-append port:${portconfigure::compiler_port}
+    } else {
+        depends_build-append port:${portconfigure::compiler_port}
+    }
+    if {[portconfigure::arch_flag_supported ${compiler}]} {
+        depends_skip_archcheck-append ${portconfigure::compiler_port}
+    }
+}
+
 # internal function to determine the default compiler
 proc portconfigure::configure_get_default_compiler {args} {
     global compiler.blacklist compiler.whitelist compiler.fallback