<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f1b9be899ccb44419d065ac34ed3c63d18cdc6b9">https://github.com/macports/macports-ports/commit/f1b9be899ccb44419d065ac34ed3c63d18cdc6b9</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 f1b9be899cc mpich: re-enable ch4; disable ipv6 (#10065)
</span>f1b9be899cc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f1b9be899ccb44419d065ac34ed3c63d18cdc6b9
</span>Author: Eric A. Borisch <borisch.eric@mayo.edu>
AuthorDate: Fri Feb 19 17:11:03 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> mpich: re-enable ch4; disable ipv6 (#10065)
</span>---
science/mpich/Portfile | 17 +++++++++++------
science/mpich/files/patch-ch4-ipv6.diff | 12 ++++++++++++
2 files changed, 23 insertions(+), 6 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 5ce58aab342..d97cfb0188a 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;'>@@ -9,7 +9,7 @@ PortGroup legacysupport 1.1
</span> # make sure to keep in sync with mpi-doc
name mpich
version 3.4.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
license BSD
categories science parallel net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,9 +154,7 @@ configure.args --disable-dependency-tracking \
</span> --enable-versioning \
--with-pm=hydra \
--with-thread-package=posix \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-device=ch3 \
</span> --with-hwloc-prefix=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-nemesis-shm-collectives \
</span> --enable-alloca \
"F90FLAGS='' F90=''"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,7 +171,8 @@ platform darwin {
</span> }
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-no_qmkshrobj.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append 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:#e0e0e0;'>@@ -241,10 +240,16 @@ if {${name} ne ${subport} && [string first "-devel" $subport] < 0} {
</span> configure.env-append \
BASH_SHELL=/bin/bash
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant tuned description {Build with more optimizations} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Renamed to standardaized 'native' name; remove 2022/02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant tuned requires native description {Build with more optimizations} {
</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;'>+ variant native description {Build for local machine} {
</span> configure.args-replace --enable-fast=O2 \
--enable-fast=all
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -fomit-frame-pointer -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note these need to be above the following foreach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append -march=native
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -march=native
</span> }
# setting xFLAGS resulting in mpicc, etc. always using these flags
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/mpich/files/patch-ch4-ipv6.diff b/science/mpich/files/patch-ch4-ipv6.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8a1da40794a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/mpich/files/patch-ch4-ipv6.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/util/mpir_cvars.c.orig 2021-02-19 13:22:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/util/mpir_cvars.c 2021-02-19 13:23:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6778,6 +6778,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rc = MPL_env2bool("MPIR_CVAR_OFI_SKIP_IPV6", &(MPIR_CVAR_OFI_SKIP_IPV6));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MPIR_ERR_CHKANDJUMP1((-1 == rc),mpi_errno,MPI_ERR_OTHER,"**envvarparse","**envvarparse %s","MPIR_CVAR_OFI_SKIP_IPV6");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* DISABLE IPV6 FOR NOW. https://github.com/pmodels/mpich/issues/5041 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MPIR_CVAR_OFI_SKIP_IPV6 = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defaultval.d = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MPIR_T_CVAR_REGISTER_STATIC(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MPI_INT,
</span></pre><pre style='margin:0'>
</pre>