<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d859eb7682daedca7779e6c00dcb3fc04b333f72">https://github.com/macports/macports-ports/commit/d859eb7682daedca7779e6c00dcb3fc04b333f72</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 d859eb7682d openmpi: always define all subports
</span>d859eb7682d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d859eb7682daedca7779e6c00dcb3fc04b333f72
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jan 16 16:21:51 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> openmpi: always define all subports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Ports that exist on some platforms but not others cause problems for
</span><span style='display:block; white-space:pre;color:#404040;'> several jobs that iterate through all ports and platforms.
</span>---
science/openmpi/Portfile | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/Portfile b/science/openmpi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f9ab22bf18..4a17038968d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/openmpi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/openmpi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,6 +82,7 @@ array set clist {
</span> gcc7 {macports-gcc-7}
gcc8 {macports-gcc-8}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set clist_unsupported [list]
</span> # gcc 4.x not supported on mac OS 10.12 (Darwin16) or newer
# clang 3.{3,4} not supported on mac OS 10.12 (Darwin16) or newer
if { ${os.major} < 16 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,18 +90,28 @@ if { ${os.major} < 16 } {
</span> set clist(clang34) {macports-clang-3.4}
# Only provide gcc 4.9, as older versions do not build.
set clist(gcc49) {macports-gcc-4.9}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend clist_unsupported clang33 clang34 gcc49
</span> }
# clang 3.7,4.0 not supported on mac OS 10.14 (Darwin18) or newer
if { ${os.major} < 18 } {
set clist(clang37) {macports-clang-3.7}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend clist_unsupported clang37
</span> }
# gcc 9+ only available on macOS10.7 (Darwin11) and newer
if { ${os.major} > 10 } {
set clist(gcc9) {macports-gcc-9}
set clist(gcc10) {macports-gcc-10}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend clist_unsupported gcc9 gcc10
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach key [array name clist] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach key [array names clist] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ${name}-${key} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ${name}-devel-${key} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach key ${clist_unsupported} {
</span> subport ${name}-${key} {}
subport ${name}-devel-${key} {}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,8 +152,14 @@ configure.ldflags-delete -L${prefix}/lib
</span> build.dir ${configure.dir}
destroot.dir ${build.dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} != ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cname [lindex [split ${subport} -] end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set cname [lindex [split ${subport} -] end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${cname} in ${clist_unsupported}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "${subport} is not supported on ${os.platform} ${os.major}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append long_description " Note: ${cname} not supported on ${os.platform} ${os.major}."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${subport} ne ${name}} {
</span> if {${cname} == "default"} {
set cname mp
}
</pre><pre style='margin:0'>
</pre>