<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/d9fcac322307dcb10142fc7e60949b6e8324e1c9">https://github.com/macports/macports-ports/commit/d9fcac322307dcb10142fc7e60949b6e8324e1c9</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 d9fcac32230 mpich: mark subports as known_fail instead of conditionally removing them on unsupported OSes
</span>d9fcac32230 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d9fcac322307dcb10142fc7e60949b6e8324e1c9
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Mar 17 11:40:35 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> mpich: mark subports as known_fail instead of conditionally removing them on unsupported OSes
</span>---
science/mpich/Portfile | 69 +++++++++++++++++++++++++-------------------------
1 file changed, 35 insertions(+), 34 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/mpich/Portfile b/science/mpich/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6607355b9a4..f6a22edf672 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/mpich/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/mpich/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,45 +59,27 @@ if {[string first "-devel" $subport] > 0} {
</span> # Sub-ports names and corresponding configure.compiler value
array set clist {
clang {clang}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${configure.build_arch} ne "arm64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Only clang 9.0+ and gcc8+ available on macOS11 (Darwin20) or newer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 20 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clist(clang50) {macports-clang-5.0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clist(gcc5) {macports-gcc-5}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clist(gcc6) {macports-gcc-6}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clist(gcc7) {macports-gcc-7}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clist(gcc8) {macports-gcc-8}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang50 {macports-clang-5.0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc5 {macports-gcc-5}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc6 {macports-gcc-6}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc7 {macports-gcc-7}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc8 {macports-gcc-8}
</span> }
# gcc 4.x not supported on mac OS 10.12 (Darwin16) or newer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 16 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Only provide gcc 4.9, as older versions do not build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clist(gcc49) {macports-gcc-4.9}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Only provide gcc 4.9, as older versions do not build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clist(gcc49) {macports-gcc-4.9}
</span> # gcc 9+ only available on macOS10.7 (Darwin11) and newer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} > 10 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} ne "arm64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clist(gcc9) {macports-gcc-9}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clist(gcc10) {macports-gcc-10}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clist(gccdevel) {macports-gcc-devel}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clist(gcc9) {macports-gcc-9}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clist(gcc10) {macports-gcc-10}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clist(gccdevel) {macports-gcc-devel}
</span> # clang 6+ only available on macOS10.9 (Darwin13) and newer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} > 12 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} ne "arm64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Only clang 9.0+ available on macOS11 (Darwin20) or newer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 20 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clist(clang60) {macports-clang-6.0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clist(clang70) {macports-clang-7.0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clist(clang80) {macports-clang-8.0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clist(clang90) {macports-clang-9.0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clist(clang10) {macports-clang-10}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clist(clang11) {macports-clang-11}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clist(clang60) {macports-clang-6.0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clist(clang70) {macports-clang-7.0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clist(clang80) {macports-clang-8.0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clist(clang90) {macports-clang-9.0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clist(clang10) {macports-clang-10}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clist(clang11) {macports-clang-11}
</span>
foreach key [array name clist] {
subport ${name}-${key} {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,6 +114,16 @@ if {${name} ne ${subport} && [string first "-devel" $subport] < 0} {
</span> if { ${os.major} < 10 && [vercmp ${compiler_version} 8] >= 0 } {
set fail yes
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 11 && ${compiler_version} eq "devel" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} > 19 && [vercmp ${compiler_version} 8] < 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Assume gcc11+ will support arm. To be seen.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${configure.build_arch} eq "arm64" && [vercmp ${compiler_version} 11] < 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {${compiler} eq "clang"} {
if { ${os.major} < 10 && [vercmp ${compiler_version} 8] >= 0 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,6 +132,15 @@ if {${name} ne ${subport} && [string first "-devel" $subport] < 0} {
</span> if { ${os.major} < 9 && [vercmp ${compiler_version} 5] >= 0 } {
set fail yes
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 13 && [vercmp ${compiler_version} 6] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} > 19 && [vercmp ${compiler_version} 9] < 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${configure.build_arch} eq "arm64" && [vercmp ${compiler_version} 11] < 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {${compiler} eq "default" && ${configure.compiler} eq "clang"} {
if {[vercmp 421.11.66 ${compiler_version}] <= 0 && [vercmp ${compiler_version} 425.0.24] < 0} {
</pre><pre style='margin:0'>
</pre>