<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/74582fc80ce4ad0a5212c070932e3b3410a4c604">https://github.com/macports/macports-base/commit/74582fc80ce4ad0a5212c070932e3b3410a4c604</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 74582fc portconfigure: Add support for Macports Clang versions 10+, where the .<minor> version is dropped
</span>74582fc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 74582fc80ce4ad0a5212c070932e3b3410a4c604
</span>Author: Chris Jones <jonesc@hep.phy.cam.ac.uk>
AuthorDate: Sun Apr 26 18:24:50 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> portconfigure: Add support for Macports Clang versions 10+, where the .<minor> version is dropped
</span>---
src/port1.0/portconfigure.tcl | 53 ++++++++++++++++++++-----------------------
1 file changed, 25 insertions(+), 28 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 833b19f..da72bda 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;'>@@ -323,30 +323,26 @@ proc portconfigure::configure_start {args} {
</span>
set compiler [option configure.compiler]
set valid_compilers {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {^apple-gcc-(4\.[02])$} {MacPorts Apple GCC %s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^cc$} {System cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^clang$} {Xcode Clang}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^gcc$} {System GCC}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^gcc-(3\.3|4\.[02])$} {Xcode GCC %s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^llvm-gcc-4\.2$} {Xcode LLVM-GCC 4.2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-clang$} {MacPorts Clang (port select)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-clang-(\d+\.\d+)$} {MacPorts Clang %s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-gcc$} {MacPorts GCC (port select)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-gcc-(\d+(?:\.\d+)?)$} {MacPorts GCC %s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-llvm-gcc-4\.2$} {MacPorts LLVM-GCC 4.2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-g95$} {MacPorts G95}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-mpich-default$} {MacPorts MPICH Wrapper for MacPorts' Default C/C++ Compiler}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-openmpi-default$} {MacPorts Open MPI Wrapper for MacPorts' Default C/C++ Compiler}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-mpich-clang$} {MacPorts MPICH Wrapper for Xcode Clang}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-openmpi-clang$} {MacPorts Open MPI Wrapper for Xcode Clang}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-mpich-clang-(\d+\.\d+)$}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {MacPorts MPICH Wrapper for Clang %s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-openmpi-clang-(\d+\.\d+)$}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {MacPorts Open MPI Wrapper for Clang %s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-mpich-gcc-(\d+(?:\.\d+)?)$}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {MacPorts MPICH Wrapper for GCC %s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-openmpi-gcc-(\d+(?:\.\d+)?)$}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {MacPorts Open MPI Wrapper for GCC %s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^apple-gcc-(4\.[02])$} {MacPorts Apple GCC %s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^cc$} {System cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^clang$} {Xcode Clang}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^gcc$} {System GCC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^gcc-(3\.3|4\.[02])$} {Xcode GCC %s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^llvm-gcc-4\.2$} {Xcode LLVM-GCC 4.2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-clang$} {MacPorts Clang (port select)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-clang-(\d+(?:\.\d+)?)$} {MacPorts Clang %s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-gcc$} {MacPorts GCC (port select)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-gcc-(\d+(?:\.\d+)?)$} {MacPorts GCC %s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-llvm-gcc-4\.2$} {MacPorts LLVM-GCC 4.2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-g95$} {MacPorts G95}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-mpich-default$} {MacPorts MPICH Wrapper for MacPorts' Default C/C++ Compiler}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-openmpi-default$} {MacPorts Open MPI Wrapper for MacPorts' Default C/C++ Compiler}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-mpich-clang$} {MacPorts MPICH Wrapper for Xcode Clang}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-openmpi-clang$} {MacPorts Open MPI Wrapper for Xcode Clang}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-mpich-clang-(\d+(?:\.\d+)?)$} {MacPorts MPICH Wrapper for Clang %s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-openmpi-clang-(\d+(?:\.\d+)?)$} {MacPorts Open MPI Wrapper for Clang %s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-mpich-gcc-(\d+(?:\.\d+)?)$} {MacPorts MPICH Wrapper for GCC %s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-openmpi-gcc-(\d+(?:\.\d+)?)$} {MacPorts Open MPI Wrapper for GCC %s}
</span> }
foreach {re fmt} $valid_compilers {
if {[set matches [regexp -inline $re $compiler]] ne ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -614,11 +610,12 @@ proc portconfigure::arch_flag_supported {compiler {multiple_arch_flags no}} {
</span> proc portconfigure::compiler_port_name {compiler} {
set valid_compiler_ports {
{^apple-gcc-(\d+)\.(\d+)$} {apple-gcc%s%s}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-clang-(\d+\.\d+)$} {clang-%s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-clang-(\d+(?:\.\d+)?)$} {clang-%s}
</span> {^macports-(llvm-)?gcc-(\d+)(?:\.(\d+))?$} {%sgcc%s%s}
{^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}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ {^macports-(mpich|openmpi|mpich-devel|openmpi-devel)-clang-(\d+)$} {%s-clang%s}
</span> {^macports-(mpich|openmpi|mpich-devel|openmpi-devel)-gcc-(\d+)(?:\.(\d+))?$} {%s-gcc%s%s}
{^macports-g95$} {g95}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1233,7 +1230,7 @@ proc portconfigure::configure_get_compiler {type {compiler {}}} {
</span> cxx -
objcxx { return ${prefix_frozen}/bin/clang++${suffix} }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[regexp {^macports-clang(-\d+\.\d+)$} $compiler -> suffix]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[regexp {^macports-clang(-\d+(?:\.\d+)?)$} $compiler -> suffix]} {
</span> set suffix "-mp${suffix}"
switch $type {
cc -
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1277,7 +1274,7 @@ proc portconfigure::configure_get_compiler {type {compiler {}}} {
</span> cxx -
objcxx { return ${prefix_frozen}/bin/mpicxx-${mpi}-clang }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[regexp {^macports-(mpich|openmpi|mpich-devel|openmpi-devel)-clang-(\d+\.\d+)$} $compiler -> mpi version]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[regexp {^macports-(mpich|openmpi|mpich-devel|openmpi-devel)-clang-(\d+(?:\.\d+)?)$} $compiler -> mpi version]} {
</span> set suffix [join [split ${version} .] ""]
switch $type {
cc -
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1395,7 +1392,7 @@ proc portconfigure::add_compiler_port_dependencies {compiler} {
</span> depends_lib-delete $libgcc_dep
depends_lib-append $libgcc_dep
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[regexp {^macports-clang(?:-(\d+\.\d+))$} $compiler -> clang_version]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[regexp {^macports-clang(?:-(\d+(?:\.\d+)?))$} $compiler -> clang_version]} {
</span> if {[option configure.cxx_stdlib] eq "macports-libstdc++"} {
# see https://trac.macports.org/ticket/54766
ui_debug "Adding depends_lib path:lib/libgcc/libgcc_s.1.dylib:libgcc"
</pre><pre style='margin:0'>
</pre>