<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/5c7cf402b57be8cb4d14b78c4024b9a3375a27a9">https://github.com/macports/macports-ports/commit/5c7cf402b57be8cb4d14b78c4024b9a3375a27a9</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 5c7cf402b57 compilers,mpi PG: Only warn if removing an already not available compiler option
</span>5c7cf402b57 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5c7cf402b57be8cb4d14b78c4024b9a3375a27a9
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Mar 17 09:15:00 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> compilers,mpi PG: Only warn if removing an already not available compiler option
</span>---
_resources/port1.0/group/compilers-1.0.tcl | 13 ++++++++++---
_resources/port1.0/group/mpi-1.0.tcl | 7 ++++++-
2 files changed, 16 insertions(+), 4 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 3f1c6caf81c..21bccaa7fce 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;'>@@ -586,7 +586,8 @@ proc compilers.action_enforce_some_f {ports} {
</span> proc compilers.setup {args} {
global cdb compilers.variants compilers.clang_variants compilers.gcc_variants \
compilers.my_fortran_variants compilers.require_fortran compilers.default_fortran \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- compilers.setup_done compilers.list compilers.gcc_default compiler.blacklist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.setup_done compilers.list compilers.gcc_default compiler.blacklist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.major os.arch
</span>
if {!${compilers.setup_done}} {
set add_list {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -639,9 +640,15 @@ proc compilers.setup {args} {
</span> }
default {
if {[info exists cdb($v,variant)] == 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "no such compiler: $v"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If removing an already not available compiler just warn, otherwise hard error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${mode} eq "add" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Compiler ${v} not available for Darwin${os.major} ${os.arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Compiler ${v} not available for Darwin${os.major} ${os.arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ${mode}_list [${mode}_from_list [set ${mode}_list] $cdb($v,variant)]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set ${mode}_list [${mode}_from_list [set ${mode}_list] $cdb($v,variant)]
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/mpi-1.0.tcl b/_resources/port1.0/group/mpi-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e0eff29466..c433b2308c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/mpi-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/mpi-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -267,7 +267,12 @@ proc mpi.setup {args} {
</span> [info exists cdb($v,variant)]} {
set cl [add_from_list $cl $variant]
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "no such mpi package: $v"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If removing an already not available compiler just warn, otherwise hard error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${mode} eq "add" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "MPI package ${v} not available for Darwin${os.major} ${os.arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "MPI package ${v} not available for Darwin${os.major} ${os.arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
} else {
set ${mode}_list [${mode}_from_list [set ${mode}_list] $mpidb($v,variant)]
</pre><pre style='margin:0'>
</pre>