<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/8ea6c676e0df04f9f90b2b9eb6190901e20a5e03">https://github.com/macports/macports-ports/commit/8ea6c676e0df04f9f90b2b9eb6190901e20a5e03</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 8ea6c676e0d openmpi/mpich: refactor note generation to pg mpiutil; cleanup
</span>8ea6c676e0d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8ea6c676e0df04f9f90b2b9eb6190901e20a5e03
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu May 20 07:35:22 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> openmpi/mpich: refactor note generation to pg mpiutil; cleanup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62878
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62887
</span>---
_resources/port1.0/group/mpiutil-1.0.tcl | 13 ++++
science/mpich/Portfile | 102 ++++++++++++++++---------------
science/openmpi/Portfile | 23 ++++---
3 files changed, 79 insertions(+), 59 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 dfb31b54146..22f162e5ff7 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;'>@@ -23,6 +23,7 @@ proc mpiutil_add_subports {name subport clist clist_unsupported clist_obsolete}
</span>
proc mpiutil_add_subport {name subport key} {
subport ${name}-${key} {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # TODO: Remove all traces of -devel on or after Janurary 2022
subport ${name}-devel-${key} {
PortGroup obsolete 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,3 +142,15 @@ proc mpiutil_set_binary_eligibility {subport cname} {
</span> return 0
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc mpiutil_add_notes {name subport cname select_file} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The mpicc wrapper (and friends) are installed as:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/bin/mpicc-${name}-${cname} (likewise mpicxx, ...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To make ${subport}'s wrappers the default (what you get when you execute 'mpicc' etc.) please run:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo port select --set mpi [file tail ${select_file}]
</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;'>+
</span><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 03be121941e..320a77b1969 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;'>@@ -265,46 +265,6 @@ if {${subport_enabled}} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fortran headers do not understand preprocessors commands like __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fortran mod files can not be merged for different architectures
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # create a architecture specific folder for the non-build_arch architecture
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-universal_fortran.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch32 "ppc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch64 "ppc64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch32 "i386"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch64 "x86_64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_32_BIT_ARCH__|${arch32}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/env/mpifort.bash.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_64_BIT_ARCH__|${arch64}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/env/mpifort.bash.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_BUILD_ARCH__|${build_arch}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/env/mpifort.bash.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- merger-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set incdir ${destroot}-${arch}${prefix}/include/${name}-${cname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${arch} ne ${build_arch}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set archinc ${incdir}/${arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${archinc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob -nocomplain -directory ${incdir} *.mod mpif.h] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${f} ${archinc}
</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;'>- }
</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;'>-
</span> post-destroot {
# This version doesn't supply doc/manpages
if {[file isdirectory ${destroot}${prefix}/share/man]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -357,6 +317,54 @@ if {${subport_enabled}} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Universal Build Support - START
</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 {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fortran headers do not understand preprocessors commands like __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fortran mod files can not be merged for different architectures
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # create a architecture specific folder for the non-build_arch architecture
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-universal_fortran.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch32 "ppc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch64 "ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch32 "i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch64 "x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_32_BIT_ARCH__|${arch32}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/env/mpifort.bash.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_64_BIT_ARCH__|${arch64}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/env/mpifort.bash.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_BUILD_ARCH__|${build_arch}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/env/mpifort.bash.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ merger-post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set incdir ${destroot}-${arch}${prefix}/include/${name}-${cname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${arch} ne ${build_arch}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set archinc ${incdir}/${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${archinc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -nocomplain -directory ${incdir} *.mod mpif.h] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${f} ${archinc}
</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;'>+ }
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Universal Build Support - END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant threads description {Build with full thread support} {
configure.args-append --enable-threads=multiple
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -378,13 +386,8 @@ if {${subport_enabled}} {
</span> configure.cxxflags-append -march=native
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The mpicc wrapper (and friends) are installed as:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/bin/mpicc-${name}-${cname} (likewise mpicxx, ...)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-To make ${subport}'s wrappers the default (what you get when you execute 'mpicc' etc.) please run:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo port select --set mpi [file tail ${select.file}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpiutil_add_notes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name} ${subport} ${cname} ${select.file}
</span>
if {[variant_isset gcc48] ||
[variant_isset gcc49] ||
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -393,13 +396,14 @@ To make ${subport}'s wrappers the default (what you get when you execute 'mpicc'
</span> [variant_isset gcc7] ||
[variant_isset gcc8] ||
[variant_isset gcc9] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set DEFAULT_MSG "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set msg "
</span> ----------------------------------------
NOTE: Default fortran changed to +gcc10; consider switching variants to enable\
pre-built packages for ${subport} by running:
sudo port clean ${subport} && sudo port upgrade ${subport} +gcc10 -[gcc_variant_name]
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append ${DEFAULT_MSG}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append ${msg}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unset msg
</span> }
} else {
<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 289663c9932..86d3505ae9b 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;'>@@ -269,6 +269,10 @@ if {${subport_enabled}} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Universal Build Support - START
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![info exists universal_possible]} {
set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -347,26 +351,25 @@ if {${subport_enabled}} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant valgrind description {enable valgrind support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Universal Build Support - END
</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 valgrind description {Enable valgrind support} {
</span> depends_lib-append path:${prefix}/lib/pkgconfig/valgrind.pc:valgrind
configure.args-append --enable-debug --enable-memchecker --with-valgrind=${prefix}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant heterogeneous description {enable heterogeneous support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant heterogeneous description {Enable heterogeneous cluster support} {
</span> configure.args-append --enable-heterogeneous
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mpi1 description {enable legacy mpi1 compatibility} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mpi1 description {Enable legacy mpi1 compatibility} {
</span> configure.args-append --enable-mpi1-compatibility
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The mpicc wrapper (and friends) are installed as:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/bin/mpicc-${name}-${cname} (likewise mpicxx, ...)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-To make ${subport}'s wrappers the default (what you get when you execute 'mpicc' etc.) please run:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo port select --set mpi [file tail ${select.file}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpiutil_add_notes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name} ${subport} ${cname} ${select.file}
</span>
} else {
depends_lib-append port:${name}-default
</pre><pre style='margin:0'>
</pre>