[125578] trunk/base/src/port1.0/portconfigure.tcl

[ryandesign at macports.org]

Revision: 125578
          https://trac.macports.org/changeset/125578
Author:   ryandesign at macports.org
Date:     2014-09-21 17:01:45 -0700 (Sun, 21 Sep 2014)
Log Message:
-----------
portconfigure.tcl: support new gcc 5+ version numbering scheme

Modified Paths:
--------------
    trunk/base/src/port1.0/portconfigure.tcl

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2014-09-22 00:00:33 UTC (rev 125577)
+++ trunk/base/src/port1.0/portconfigure.tcl	2014-09-22 00:01:45 UTC (rev 125578)
@@ -227,7 +227,7 @@
         {^macports-dragonegg-(\d+\.\d+)-gcc-(\d+\.\d+)$}
             {MacPorts DragonEgg %s with GCC %s}
         {^macports-gcc$}                    {MacPorts GCC (port select)}
-        {^macports-gcc-(\d+\.\d+)$}         {MacPorts GCC %s}
+        {^macports-gcc-(\d+(?:\.\d+)?)$}    {MacPorts GCC %s}
         {^macports-llvm-gcc-4\.2$}          {MacPorts LLVM-GCC 4.2}
     }
     foreach {re fmt} $valid_compilers {
@@ -383,7 +383,7 @@
         {^apple-gcc-(\d+)\.(\d+)$}                          {apple-gcc%s%s}
         {^macports-clang-(\d+\.\d+)$}                       {clang-%s}
         {^macports-dragonegg-(\d+\.\d+)(-gcc-\d+\.\d+)?$}   {dragonegg-%s%s}
-        {^macports-(llvm-)?gcc-(\d+)\.(\d+)$}               {%sgcc%s%s}
+        {^macports-(llvm-)?gcc-(\d+)(?:\.(\d+))?$}          {%sgcc%s%s}
     }
     foreach {re fmt} $valid_compiler_ports {
         if {[set matches [regexp -inline $re $compiler]] ne ""} {
@@ -548,7 +548,7 @@
             f77     -
             f90     { return ${prefix}/bin/dragonegg${infix}-gfortran${suffix} }
         }
-    } elseif {[regexp {^macports-gcc(-\d+\.\d+)?$} $compiler -> suffix]} {
+    } elseif {[regexp {^macports-gcc(-\d+(?:\.\d+)?)?$} $compiler -> suffix]} {
         if {$suffix ne ""} {
             set suffix "-mp${suffix}"
         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140921/fa01d367/attachment.html>