<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/53f4e44062ce097502b3c77772d704cadee7ca7d">https://github.com/macports/macports-ports/commit/53f4e44062ce097502b3c77772d704cadee7ca7d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 53f4e44 compilers PG: Cleaner logic for clang compiler versions
</span>53f4e44 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 53f4e44062ce097502b3c77772d704cadee7ca7d
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Apr 29 09:38:49 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> compilers PG: Cleaner logic for clang compiler versions
</span>---
_resources/port1.0/group/compilers-1.0.tcl | 51 +++++++++++++-----------------
1 file changed, 22 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/compilers-1.0.tcl b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index da4c019..1117c68 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,35 +117,28 @@ foreach v ${gcc_versions} {
</span> set cdb(gcc$v,cxx_stdlib) libstdc++
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set clang_versions {33 34 37 50 60 70 80 90 10}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach v ${clang_versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string length $v] <= 1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set compiler_version $v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {$v >= 33} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if the string is more than one character insert a '.' into it: e.g 33 -> 3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set compiler_version [string index $v 0].[string index $v 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # starting with Clang 10, the naming scheme changed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set compiler_version $v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers.clang_variants clang$v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,variant) clang$v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,compiler) macports-clang-$compiler_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,descrip) "MacPorts clang $compiler_version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,depends) port:clang-$compiler_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,dependsl) ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,libfortran) ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,dependsd) ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,dependsa) clang-$compiler_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,conflict) ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,cc) ${prefix}/bin/clang-mp-$compiler_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,cxx) ${prefix}/bin/clang++-mp-$compiler_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,cpp) "${prefix}/bin/clang-mp-$compiler_version -E"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,objc) ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,fc) ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,f77) ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,f90) ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(clang$v,cxx_stdlib) ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clang_versions {3.3 3.4 3.7 5.0 6.0 7.0 8.0 9.0 10}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach ver ${clang_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove dot from version if present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ver_nodot [string map {. {}} ${ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers.clang_variants clang$ver_nodot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,variant) clang$ver_nodot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,compiler) macports-clang-$ver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,descrip) "MacPorts clang $ver"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,depends) port:clang-$ver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,dependsl) ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,libfortran) ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,dependsd) ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,dependsa) clang-$ver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,conflict) ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,cc) ${prefix}/bin/clang-mp-$ver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,cxx) ${prefix}/bin/clang++-mp-$ver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,cpp) "${prefix}/bin/clang-mp-$ver -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,objc) ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,fc) ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,f77) ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,f90) ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(clang$ver_nodot,cxx_stdlib) ""
</span> }
# and lastly we add a gfortran and g95 variant for use with clang*; note that
</pre><pre style='margin:0'>
</pre>