<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch release-2.6
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/ce26682ef3a30208eeec4900421a6aff0f45d789">https://github.com/macports/macports-base/commit/ce26682ef3a30208eeec4900421a6aff0f45d789</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/release-2.6 by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new ce26682  Add support for macports development clang/gcc ports as compiler options
</span>ce26682 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ce26682ef3a30208eeec4900421a6aff0f45d789
</span>Author: Chris Jones <jonesc@hep.phy.cam.ac.uk>
AuthorDate: Tue May 5 12:29:54 2020 +0100

<span style='display:block; white-space:pre;color:#404040;'>    Add support for macports development clang/gcc ports as compiler options
</span>---
 src/port1.0/portconfigure.tcl | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index da72bda..5e044b3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -343,6 +343,7 @@ proc portconfigure::configure_start {args} {
</span>         {^macports-openmpi-clang-(\d+(?:\.\d+)?)$} {MacPorts Open MPI Wrapper for Clang %s}
         {^macports-mpich-gcc-(\d+(?:\.\d+)?)$}     {MacPorts MPICH Wrapper for GCC %s}
         {^macports-openmpi-gcc-(\d+(?:\.\d+)?)$}   {MacPorts Open MPI Wrapper for GCC %s}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        {^macports-(clang|gcc)-devel$}             {MacPorts %s Development}
</span>     }
     foreach {re fmt} $valid_compilers {
         if {[set matches [regexp -inline $re $compiler]] ne ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -609,15 +610,16 @@ proc portconfigure::arch_flag_supported {compiler {multiple_arch_flags no}} {
</span> 
 proc portconfigure::compiler_port_name {compiler} {
     set valid_compiler_ports {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        {^apple-gcc-(\d+)\.(\d+)$}                          {apple-gcc%s%s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        {^macports-clang-(\d+(?:\.\d+)?)$}                  {clang-%s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        {^macports-(llvm-)?gcc-(\d+)(?:\.(\d+))?$}          {%sgcc%s%s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        {^apple-gcc-(\d+)\.(\d+)$}                                                    {apple-gcc%s%s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        {^macports-clang-(\d+(?:\.\d+)?)$}                                            {clang-%s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        {^macports-(llvm-)?gcc-(\d+)(?:\.(\d+))?$}                                    {%sgcc%s%s}
</span>         {^macports-(mpich|openmpi|mpich-devel|openmpi-devel)-default$}                {%s-default}
         {^macports-(mpich|openmpi|mpich-devel|openmpi-devel)-clang$}                  {%s-clang}
         {^macports-(mpich|openmpi|mpich-devel|openmpi-devel)-clang-(\d+)\.(\d+)$}     {%s-clang%s%s}
         {^macports-(mpich|openmpi|mpich-devel|openmpi-devel)-clang-(\d+)$}            {%s-clang%s}
         {^macports-(mpich|openmpi|mpich-devel|openmpi-devel)-gcc-(\d+)(?:\.(\d+))?$}  {%s-gcc%s%s}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        {^macports-g95$}                                    {g95}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        {^macports-g95$}                                                              {g95}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        {^macports-(clang|gcc)-devel$}                                                {%s-devel}
</span>     }
     foreach {re fmt} $valid_compiler_ports {
         if {[set matches [regexp -inline $re $compiler]] ne ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1253,6 +1255,28 @@ proc portconfigure::configure_get_compiler {type {compiler {}}} {
</span>             f77     -
             f90     { return ${prefix_frozen}/bin/gfortran${suffix} }
         }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {[regexp {^macports-(clang|gcc)-devel$} $compiler -> comp]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set suffix "-mp-devel"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if { $comp eq "clang" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            switch $type {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                cc      -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                objc    { return ${prefix_frozen}/bin/clang${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                cxx     -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                objcxx  { return ${prefix_frozen}/bin/clang++${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                cpp     { return ${prefix_frozen}/bin/clang-cpp${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            switch $type {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                cc      -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                objc    { return ${prefix_frozen}/bin/gcc${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                cxx     -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                objcxx  { return ${prefix_frozen}/bin/g++${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                cpp     { return ${prefix_frozen}/bin/cpp${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                fc      -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                f77     -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                f90     { return ${prefix_frozen}/bin/gfortran${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     } elseif {$compiler eq "macports-llvm-gcc-4.2"} {
         switch $type {
             cc      -
</pre><pre style='margin:0'>

</pre>