<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c2d16c82aa8217a568d752fd1097b2418380ce74">https://github.com/macports/macports-ports/commit/c2d16c82aa8217a568d752fd1097b2418380ce74</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 c2d16c82aa8 pg mpiutil: refactor disable/fail copy-pasta
</span>c2d16c82aa8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c2d16c82aa8217a568d752fd1097b2418380ce74
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed May 26 10:12:48 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> pg mpiutil: refactor disable/fail copy-pasta
</span>---
_resources/port1.0/group/mpiutil-1.0.tcl | 88 +++++++++++++++++---------------
1 file changed, 46 insertions(+), 42 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/mpiutil-1.0.tcl b/_resources/port1.0/group/mpiutil-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index bb62b0328c2..3ef6672b741 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/mpiutil-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/mpiutil-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,25 +26,39 @@ proc mpiutil_add_subport {name subport cname} {
</span>
# TODO: Remove all traces of -devel on or after Janurary 2022
subport ${name}-devel-${cname} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set msg "${subport}: Devel subports no longer supported"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpiutil_set_subport_disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name} ${subport} ${cname} ${msg}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set msg "${subport}: Devel subports no longer supported"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error ${msg}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc mpiutil_set_subport_disabled {name subport cname msg} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match "clang*" ${cname}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by ${name}-clang90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[string match "gcc*" ${cname}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by ${name}-gcc7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by ${name}-${cname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error ${msg}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match "clang*" ${cname}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by ${name}-clang90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[string match "gcc*" ${cname}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by ${name}-gcc7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by ${name}-${cname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description-append "\nNOTE: ${msg}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description-append "\nNOTE: ${msg}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc mpiutil_set_subport_fail {name subport cname msg} {
</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 ${msg}
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description-append "\nNOTE: ${msg}"
</span> }
proc mpiutil_validate_subport {name subport cname clist clist_unsupported clist_obsolete} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,32 +68,23 @@ proc mpiutil_validate_subport {name subport cname clist clist_unsupported clist_
</span> set subport_enabled no
if {[string match "${name}-devel-*" ${subport}]} {
ui_debug "mpiutil_validate_subport: disable devel-related subport: ${subport}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Note: Nothing else needed, as subport obsoleted, etc, when defined earlier
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } elseif {${cname} in ${clist_unsupported}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "mpiutil_validate_subport: disable unsupported subport: ${subport}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set msg "${subport} is not supported on ${os.platform} ${os.major}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error ${msg}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description-append "\nNOTE: ${msg}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "mpiutil_validate_subport: fail unsupported subport: ${subport}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set msg "${subport} is not supported on ${os.platform} ${os.major}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpiutil_set_subport_fail \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name} ${subport} ${cname} ${msg}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } elseif {${cname} in ${clist_obsolete}} {
ui_debug "mpiutil_validate_subport: disable obsolete subport: ${subport}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup obsolete 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set msg "${subport} is obsolete"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error ${msg}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set msg "${subport}: This subport is obsolete"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpiutil_set_subport_disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name} ${subport} ${cname} ${msg}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match "clang*" ${cname}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by ${name}-clang90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by ${name}-gcc7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description-append "\nNOTE: ${msg}"
</span> } elseif {${subport} ne ${name}} {
set subport_enabled yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,16 +92,15 @@ proc mpiutil_validate_subport {name subport cname clist clist_unsupported clist_
</span> if {${configure.compiler} eq "clang"} {
set compiler_version [compiler.command_line_tools_version ${configure.compiler}]
if {[vercmp 421.11.66 ${compiler_version}] <= 0 && [vercmp ${compiler_version} 425.0.24] < 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "mpiutil_validate_subport: apple clang segfault potential; disable subport: ${subport}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "mpiutil_validate_subport: apple clang segfault potential; fail subport: ${subport}"
</span>
# Linker for Apple clang version 421.11.66 segfaults
# See https://trac.macports.org/ticket/36654#comment:9
<span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} fails on OS ${os.major} with compiler\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${configure.compiler}, version ${compiler_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible macOS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set msg "${subport} fails on OS ${os.major} with compiler\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${configure.compiler}, version ${compiler_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpiutil_set_subport_fail \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name} ${subport} ${cname} ${msg}
</span>
set subport_enabled no
}
</pre><pre style='margin:0'>
</pre>