<pre style='margin:0'>
tobypeterson pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/63a40cd9f473373b04ea92f8ca73d4de46c4fd77">https://github.com/macports/macports-ports/commit/63a40cd9f473373b04ea92f8ca73d4de46c4fd77</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 63a40cd9f47 pnetcdf: Fix broken mpi setup
</span>63a40cd9f47 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 63a40cd9f473373b04ea92f8ca73d4de46c4fd77
</span>Author: Dave Allured <dave.allured@noaa.gov>
AuthorDate: Tue Jun 3 23:51:41 2025 -0600
<span style='display:block; white-space:pre;color:#404040;'> pnetcdf: Fix broken mpi setup
</span>---
science/pnetcdf/Portfile | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pnetcdf/Portfile b/science/pnetcdf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e838a10274..e38bb0f9312 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/pnetcdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/pnetcdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup mpi 1.0
</span>
name pnetcdf
version 1.14.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> maintainers {@thiagoveloso gmail.com:thiagoveloso} openmaintainer
categories science devel
license Permissive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,31 +27,34 @@ checksums rmd160 51b2a5bc3f7dc19ce17d152b4059e00a0e492127 \
</span> sha256 575f189fb01c53f93b3d6ae0e506f46e19694807c81af0b9548e947995acf704 \
size 2419346
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.arch} eq "powerpc"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mpi.setup require -clang -gfortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.arch} eq "powerpc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpi.setup require require_fortran \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -gcc44 -gcc45 -gcc46 -gcc47 -gcc48 -gcc49 -gcc5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -clang -fortran
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mpi.setup require -gcc12 -gfortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpi.setup require require_fortran \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -gcc44 -gcc45 -gcc46 -gcc47 -gcc48 -gcc49 -gcc5
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#compilers.choose fc f77 f90 cc cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Xcode clang of 10.7 fails with error: invalid instruction mnemonic 'cvtsi2ssl'
# Copied from https://github.com/macports/macports-ports/pull/17269
# Also see https://github.com/william-dawson/NTPoly/issues/192
compiler.blacklist-append \
{clang < 500} {*gcc-[34].*} {macports-gcc-[56]}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:perl5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:autoconf \
</span> port:automake \
port:libtool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:m4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/perl:perl5
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-mpi=${prefix}
</span>
# M4 was accidentally left out of Xcode 15.3. Affects some Sonoma builds.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Use MacPorts M4. For background, see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/macports/macports-ports/pull/22985 and related tickets.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Use MacPorts M4. For background, see:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/macports/macports-ports/pull/22985
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and related tickets.
</span> configure.env-append M4=${prefix}/bin/gm4
configure.env-append MPICC=${mpi.cc} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,10 +62,13 @@ configure.env-append MPICC=${mpi.cc} \
</span> MPIF77=${mpi.f77} \
MPIF90=${mpi.f90}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +gcc12 +mpich
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset openmpi]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +mpich
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
reinplace "s|${destroot}||g" ${destroot}${prefix}/lib/pkgconfig/pnetcdf.pc
reinplace "s|${destroot}||g" ${destroot}${prefix}/bin/pnetcdf-config
</pre><pre style='margin:0'>
</pre>