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

[dstrubbe at macports.org]

Revision: 137348
          https://trac.macports.org/changeset/137348
Author:   dstrubbe at macports.org
Date:     2015-06-09 17:34:41 -0700 (Tue, 09 Jun 2015)
Log Message:
-----------
compilers portgroup:
* Bugfix: +llvm was unnecessarily conflicting with +g95 and +gfortran.
* Fixing description for +g95 so the word 'compiler' is not repeated.

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-06-09 20:08:02 UTC (rev 137347)
+++ trunk/dports/_resources/port1.0/group/compilers-1.0.tcl	2015-06-10 00:34:41 UTC (rev 137348)
@@ -139,7 +139,7 @@
 set cdb(llvm,f77)      ""
 set cdb(llvm,f90)      ""
 
-# and lastly we add a gfortran and g95 variant for use with clang*; note that
+# and lastly we add a gfortran and g95 variant for use with clang* and llvm; note that
 # we don't need gfortran when we are in an "only-fortran" mode
 set compilers.gfortran_equiv    gcc49
 set cdb(gfortran,variant)  gfortran
@@ -160,7 +160,7 @@
 
 set cdb(g95,variant)  g95
 set cdb(g95,compiler) g95
-set cdb(g95,descrip)  "Fortran compiler from g95"
+set cdb(g95,descrip)  "g95 Fortran"
 set cdb(g95,depends)  port:g95
 set cdb(g95,dependsl) ""
 set cdb(g95,dependsd) ""
@@ -199,13 +199,14 @@
             set i [lsearch -exact ${compilers.variants} $variant]
             set c [lreplace ${compilers.variants} $i $i]
 
-            # fortran doesn't conflict with clang
+            # Fortran compilers do not conflict with C compilers.
+            # thus, llvm and clang do not conflict with g95 and gfortran
             if {$variant eq "gfortran" || $variant eq "g95"} {
-                foreach clangcomp ${compilers.clang_variants} {
+                foreach clangcomp [concat ${compilers.clang_variants} {llvm}] {
                     set i [lsearch -exact $c $clangcomp]
                     set c [lreplace $c $i $i]
                 }
-            } elseif {[string match clang* $variant]} {
+            } elseif {[string match clang* $variant] || $variant == "llvm"} {
                 set i [lsearch -exact $c gfortran]
                 set c [lreplace $c $i $i]
                 set i [lsearch -exact $c g95]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150609/fd34b540/attachment.html>