Ticket #33890: base-compilers.patch

base/src/macports1.0/macports.tcl

@@ -1605 +1605 @@
     # add the default universal variant if appropriate, and set up flags that
     # are conditional on whether universal is set
     $workername eval universal_setup
     $workername eval debug_setup
     $workername eval debug_opt_setup
+    $workername eval compiler_setup
 
     # evaluate the variants
     if {[$workername eval eval_variants variations] != 0} {
         mportclose $mport
         error "Error evaluating variants"

base/src/port1.0/portutil.tcl

@@ -2042 +2042 @@
             configure.f90flags-append   -O0
         }
     }
 }
 
+# add default compiler variant if appropriate
+proc compiler_setup {args} {
+
+    # build database of gcc 4{4..7} compiler attributes
+    foreach v {4 5 6 7} {
+        set db(gcc4$v,variant)  "gcc4$v"
+        set db(gcc4$v,compiler) "macports-gcc-4.$v"
+        set db(gcc4$v,descrip)  "MacPorts gcc 4.$v"
+        set db(gcc4$v,depends)  port:gcc4$v
+        set db(gcc4$v,flags)    {
+            {{"-PIC"} {"-fPIC"}}
+        }
+    }
+
+    set db(clang,variant)  clang
+    set db(clang,compiler) clang
+    set db(clang,descrip)  "Mac OS X clang"
+    set db(clang,depends)  bin:clang:clang
+    set db(clang,flags)    {
+        {{"-PIC"} {"-fPIC"}}
+    }
+
+    set db(llvm,variant)  llvm
+    set db(llvm,compiler) llvm-gcc-4.2
+    set db(llvm,descrip)  "Mac OS X llvm-gcc 4.2"
+    set db(llvm,depends)  bin:llvm-gcc-4.2:llvm-gcc42
+    set db(llvm,flags)    {
+        {{"-fPIC"} {"-PIC"}}
+    }
+
+    set db(system_gcc,variant)  system_gcc
+    set db(system_gcc,compiler) gcc-4.2
+    set db(system_gcc,descrip)  "Mac OS X gcc 4.2"
+    set db(system_gcc,depends)  bin:gcc-4.2:llvm-gcc42
+    set db(system_gcc,flags)    {
+        {{"-fPIC"} {"-PIC"}}
+    }
+
+    set variants {}
+    foreach name [array names db *,variant] {
+        lappend variants $db($name)
+    }
+
+    foreach variant $variants {
+        if {[variant_exists $variant]} {
+            ui_debug "$variant variant already exists, so not adding the default one"
+        } else {
+            set i [lsearch -exact $variants $variant]
+            set c [lreplace $variants $i $i]
+
+            # for each pair of flags (old,new), build a string of if statements to replace old with new
+            set f ""
+            foreach flag $db($variant,flags) {
+                foreach {old new} $flag {
+                    append f [subst {
+                        if {\[string first $old \${configure.cflags}\] > -1} {
+                            configure.cflags-delete $old
+                            configure.cflags-append $new
+                        }
+                        if {\[string first $old \${configure.cxxflags}\] > -1} {
+                            configure.cxxflags-delete $old
+                            configure.cxxflags-append $new
+                        }
+                    }]
+                }
+            }
+
+            eval [subst {
+                variant ${variant} description {Build using the $db($variant,descrip) compiler} conflicts $c {
+                    depends_lib-append $db($variant,depends)
+                    configure.compiler $db($variant,compiler)
+
+                    $f
+                }
+            }]
+        }
+    }
+}
+
 # Target class definition.
 
 # constructor for target object
 proc target_new {name procedure} {
     global targets