<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/391765869083138811695a7d54eef03fe76aaaf1">https://github.com/macports/macports-ports/commit/391765869083138811695a7d54eef03fe76aaaf1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 391765869083138811695a7d54eef03fe76aaaf1
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri May 7 12:37:20 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> openmpi: cleanup shared logic via new portgroup mpiutil
</span><span style='display:block; white-space:pre;color:#404040;'> * move defunct port-select files to disabled subdirectory
</span>---
science/openmpi/Portfile | 25 ++++------------------
.../openmpi/files/{ => disabled}/openmpi-clang35 | 0
.../files/{ => disabled}/openmpi-clang35-fortran | 0
.../openmpi/files/{ => disabled}/openmpi-clang36 | 0
.../files/{ => disabled}/openmpi-clang36-fortran | 0
.../openmpi/files/{ => disabled}/openmpi-clang38 | 0
.../files/{ => disabled}/openmpi-clang38-fortran | 0
.../openmpi/files/{ => disabled}/openmpi-clang39 | 0
.../files/{ => disabled}/openmpi-clang39-fortran | 0
.../openmpi/files/{ => disabled}/openmpi-clang40 | 0
.../files/{ => disabled}/openmpi-clang40-fortran | 0
.../files/{ => disabled}/openmpi-gcc43-fortran | 0
.../files/{ => disabled}/openmpi-gcc44-fortran | 0
.../files/{ => disabled}/openmpi-gcc45-fortran | 0
.../files/{ => disabled}/openmpi-gcc46-fortran | 0
.../files/{ => disabled}/openmpi-gcc47-fortran | 0
.../files/{ => disabled}/openmpi-gcc48-fortran | 0
17 files changed, 4 insertions(+), 21 deletions(-)
<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 4ce7f89eadf..232a10996aa 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;'>@@ -6,6 +6,7 @@ PortGroup select 1.0
</span> PortGroup compilers 1.0
PortGroup muniversal 1.0
PortGroup legacysupport 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup mpiutil 1.0
</span>
#===============================================================================
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,28 +202,10 @@ if {${cname} in ${clist_unsupported}} {
</span>
# As we are making wrappers, we depend on the compilers to exist.
# Add them to depends_lib, not just depends_build.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[regexp {clang[3-9]\d} ${cname}] == 1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ports for Clang versions < 10 are named: clang-<major>.<minor>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cport_name [regsub {(\d)(\d)} ${cname} {-\1.\2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[regexp {clang\d\d} ${cname}] == 1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ports for Clang version >= 10 are named: clang-<major><minor>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cport_name [regsub {(\d)(\d)} ${cname} {-\1\2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {([regexp {gcc\d} ${cname}] == 1) || ([regexp {gcc\d\d} ${cname}] == 1)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ports for GCC have names exactly matching our subports, so use as-is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cport_name ${cname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists cport_name]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Adding compiler to depends_lib: ${cport_name}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${cport_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset cport_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpiutil_add_compiler_depends_lib ${cname}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact {mp llvm clang} ${cname}] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Force local builds with Xcode-provided compilers (avoid issues with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # different Xcode versions on buildbot and user machines)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Disabling binary use for subport: ${subport}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_sites
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Determine whether buildbot binaries should be used, and disable if necessary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpiutil_set_binary_eligibility ${subport} ${cname}
</span>
depends_build-append port:pkgconfig
depends_lib-append port:hwloc \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-clang35 b/science/openmpi/files/disabled/openmpi-clang35
</span>similarity index 100%
rename from science/openmpi/files/openmpi-clang35
rename to science/openmpi/files/disabled/openmpi-clang35
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-clang35-fortran b/science/openmpi/files/disabled/openmpi-clang35-fortran
</span>similarity index 100%
rename from science/openmpi/files/openmpi-clang35-fortran
rename to science/openmpi/files/disabled/openmpi-clang35-fortran
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-clang36 b/science/openmpi/files/disabled/openmpi-clang36
</span>similarity index 100%
rename from science/openmpi/files/openmpi-clang36
rename to science/openmpi/files/disabled/openmpi-clang36
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-clang36-fortran b/science/openmpi/files/disabled/openmpi-clang36-fortran
</span>similarity index 100%
rename from science/openmpi/files/openmpi-clang36-fortran
rename to science/openmpi/files/disabled/openmpi-clang36-fortran
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-clang38 b/science/openmpi/files/disabled/openmpi-clang38
</span>similarity index 100%
rename from science/openmpi/files/openmpi-clang38
rename to science/openmpi/files/disabled/openmpi-clang38
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-clang38-fortran b/science/openmpi/files/disabled/openmpi-clang38-fortran
</span>similarity index 100%
rename from science/openmpi/files/openmpi-clang38-fortran
rename to science/openmpi/files/disabled/openmpi-clang38-fortran
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-clang39 b/science/openmpi/files/disabled/openmpi-clang39
</span>similarity index 100%
rename from science/openmpi/files/openmpi-clang39
rename to science/openmpi/files/disabled/openmpi-clang39
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-clang39-fortran b/science/openmpi/files/disabled/openmpi-clang39-fortran
</span>similarity index 100%
rename from science/openmpi/files/openmpi-clang39-fortran
rename to science/openmpi/files/disabled/openmpi-clang39-fortran
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-clang40 b/science/openmpi/files/disabled/openmpi-clang40
</span>similarity index 100%
rename from science/openmpi/files/openmpi-clang40
rename to science/openmpi/files/disabled/openmpi-clang40
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-clang40-fortran b/science/openmpi/files/disabled/openmpi-clang40-fortran
</span>similarity index 100%
rename from science/openmpi/files/openmpi-clang40-fortran
rename to science/openmpi/files/disabled/openmpi-clang40-fortran
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-gcc43-fortran b/science/openmpi/files/disabled/openmpi-gcc43-fortran
</span>similarity index 100%
rename from science/openmpi/files/openmpi-gcc43-fortran
rename to science/openmpi/files/disabled/openmpi-gcc43-fortran
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-gcc44-fortran b/science/openmpi/files/disabled/openmpi-gcc44-fortran
</span>similarity index 100%
rename from science/openmpi/files/openmpi-gcc44-fortran
rename to science/openmpi/files/disabled/openmpi-gcc44-fortran
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-gcc45-fortran b/science/openmpi/files/disabled/openmpi-gcc45-fortran
</span>similarity index 100%
rename from science/openmpi/files/openmpi-gcc45-fortran
rename to science/openmpi/files/disabled/openmpi-gcc45-fortran
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-gcc46-fortran b/science/openmpi/files/disabled/openmpi-gcc46-fortran
</span>similarity index 100%
rename from science/openmpi/files/openmpi-gcc46-fortran
rename to science/openmpi/files/disabled/openmpi-gcc46-fortran
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-gcc47-fortran b/science/openmpi/files/disabled/openmpi-gcc47-fortran
</span>similarity index 100%
rename from science/openmpi/files/openmpi-gcc47-fortran
rename to science/openmpi/files/disabled/openmpi-gcc47-fortran
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-gcc48-fortran b/science/openmpi/files/disabled/openmpi-gcc48-fortran
</span>similarity index 100%
rename from science/openmpi/files/openmpi-gcc48-fortran
rename to science/openmpi/files/disabled/openmpi-gcc48-fortran
</pre><pre style='margin:0'>
</pre>