<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/898647f33a5080ba5caf43873f1241de1a9c3921">https://github.com/macports/macports-ports/commit/898647f33a5080ba5caf43873f1241de1a9c3921</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 898647f33a5 openmpi/mpich: cleanup
</span>898647f33a5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 898647f33a5080ba5caf43873f1241de1a9c3921
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat May 22 12:34:14 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> openmpi/mpich: cleanup
</span>---
science/mpich/Portfile | 33 ++++++++++++++-------------------
science/openmpi/Portfile | 16 +++++++---------
2 files changed, 21 insertions(+), 28 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 c756be1d057..492769d80b0 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;'>@@ -70,10 +70,7 @@ livecheck.url ${homepage}/static/downloads/
</span> # Please update the mpi portgroup whenever clist is changed.
# Sub-ports names and corresponding configure.compiler value
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set clist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [dict create \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcc7 {macports-gcc-7} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clist [dict create]
</span> set clist_unsupported [list]
set clist_obsolete [list]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,6 +82,9 @@ lappend clist_obsolete \
</span> gcc49 gcc5 gcc6 gcc8 \
gccdevel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Compilers supported across-the-board
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dict set clist gcc7 {macports-gcc-7}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Only enable default (gcc), and Xcode clang, for MacOS 10.7 and later
if { ${os.major} >= 11 } {
dict set clist default {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,26 +155,22 @@ if {${subport_enabled}} {
</span> --enable-fast=O2 \
--enable-shared \
--enable-versioning \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-timer-type=mach_absolute_time \
</span> --with-pm=hydra \
--with-thread-package=posix \
--with-hwloc-prefix=${prefix} \
"F90FLAGS='' F90=''"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-timer-type=mach_absolute_time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 12} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # MPICH requires OpenCL version 1.2, which was not introduced until OS X Mountain Lion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-opencl=no
</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;'>- if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-no_qmkshrobj.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ch4-ipv6.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MPICH requires OpenCL version 1.2, which was not introduced until OS X Mountain Lion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-opencl=no
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no_qmkshrobj.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ch4-ipv6.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # We're making compiler wrappers here... don't default to -O2 for wrappers.
# Actual library code is compiled with -O2 via --enable-fast=O2 configure arg
configure.optflags-delete -O2 -Os
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -371,8 +367,7 @@ if {${subport_enabled}} {
</span> }
# Renamed to standardaized 'native' name; remove 2022/02
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant tuned requires native description {Build with more optimizations} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant tuned requires native description {Build with more optimizations} {}
</span>
variant native description {Build for local machine} {
configure.args-replace --enable-fast=O2 \
<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 86d3505ae9b..9320fb44ae2 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;'>@@ -64,15 +64,9 @@ livecheck.regex Open MPI v(\[0-9\.\]+) released
</span> # Please update the mpi portgroup whenever clist is changed.
# Sub-ports names and corresponding configure.compiler value
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set clist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [dict create \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default {} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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_unsupported \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [list]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set clist_obsolete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clist [dict create]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clist_unsupported [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clist_obsolete [list]
</span>
# TODO: Remove these obsolete subports on or after January 2022, along with all
# traces of -devel. For the latter, also remember to update proc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,6 +76,10 @@ lappend clist_obsolete \
</span> clang50 clang60 clang70 clang80 \
gcc49 gcc5 gcc6 gcc8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Compilers supported across-the-board
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dict set clist default {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dict set clist gcc7 {macports-gcc-7}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Only enable Xcode clang builds for MacOS 10.7 and later
if { ${os.major} >= 11 } {
dict set clist clang {clang}
</pre><pre style='margin:0'>
</pre>