<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6f51e86e44486253d92cabb0d5764fc947b72460">https://github.com/macports/macports-ports/commit/6f51e86e44486253d92cabb0d5764fc947b72460</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 6f51e86e444 esmf: update to 8.8.1
</span>6f51e86e444 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6f51e86e44486253d92cabb0d5764fc947b72460
</span>Author: Dave Allured <dave.allured@noaa.gov>
AuthorDate: Tue Apr 29 04:44:22 2025 -0600
<span style='display:block; white-space:pre;color:#404040;'> esmf: update to 8.8.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/68864
</span>---
science/esmf/Portfile | 60 +++++++++++++++---------------
science/esmf/files/install_name.patch | 70 -----------------------------------
2 files changed, 31 insertions(+), 99 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/esmf/Portfile b/science/esmf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0be511b441e..2e5617db0bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/esmf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/esmf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,23 +7,24 @@ PortGroup github 1.0
</span>
compilers.choose f90 cxx
compilers.setup require_fortran -clang
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compilers.allow_arguments_mismatch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yes
</span> mpi.setup
mpi.enforce_variant netcdf-fortran
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup esmf-org esmf 8.5.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3d1edb514d5b09b46f1f60047e3f5cd3c0bf7b43 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 acd0b2641587007cc3ca318427f47b9cae5bfd2da8d2a16ea778f637107c29c4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14091400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup esmf-org esmf 8.8.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 90519e3b76d1398d3bba2539d17ef27b0a6d1143 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b0acb59d4f000bfbdfddc121a24819bd2a50997c7b257b0db2ceb96f3111b173 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14253340
</span>
version [string map {_ .} ${github.version}]
categories science devel
license NCSA
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {takeshi @tenomoto} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description software for building and coupling weather, climate, and related models
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description The ESMF defines an architecture for composing complex, coupled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {takeshi @tenomoto} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {@Dave-Allured noaa.gov:dave.allured} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Software for building and coupling weather, climate, and related models
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ESMF defines an architecture for composing complex, coupled \
</span> modeling systems and includes data structures \
and utilities for developing individual models.
homepage https://earthsystemmodeling.org
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +37,10 @@ depends_lib port:netcdf \
</span> port:xercesc3 \
port:yaml-cpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Avoid duplicate LC_RPATH.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Discussion in https://github.com/macports/macports-ports/pull/21765
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.add_gcc_rpath_support no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.platform} eq "darwin" && ${os.major} < 12} {
known_fail yes
pre-fetch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,8 +49,6 @@ if {${os.platform} eq "darwin" && ${os.major} < 12} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles install_name.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
if {[variant_isset openmpi]} {
foreach c {g95 gfortran gfortranclang} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +59,6 @@ post-patch {
</span>
pre-configure {
if {${configure.cxx_stdlib} eq "libc++" && ![mpi_variant_isset]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|stdc++|c++|" ${worksrcpath}/build_config/Darwin.gfortranclang.default/build_rules.mk
</span> reinplace "s|stdc++|c++|" ${worksrcpath}/build_config/Darwin.g95.default/build_rules.mk
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,6 +91,16 @@ pre-build {
</span> ESMF_YAMLCPP_INCLUDE=${prefix}/include \
ESMF_YAMLCPP_LIBPATH=${prefix}/lib \
ESMF_INSTALL_LIBDIR=${prefix}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ESMF 8.8.0: Multiple issues with PIO. Temporarily disable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -- Internal (default) PIO requires new cmake dependency.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -- Internal PIO configure fails: "Check size of size_t - failed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -- * (Probably a library path issue, not PIO specific.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -- Internal PIO is out of date, requires patching.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -- * Maybe future fix in 8.9.0. See upstream issues.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -- More work needed for PIO.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append ESMF_PIO=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[variant_isset accelerate]} {
build.env-append ESMF_LAPACK=system \
ESMF_LAPACK_LIBS=-lvecLibFort
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,10 +144,16 @@ pre-destroot {
</span> ESMF_YAMLCPP_LIBPATH=${prefix}/lib \
ESMF_INSTALL_PREFIX=${destroot}${prefix} \
ESMF_INSTALL_HEADERDIR=${destroot}${prefix}/include/${name} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_INSTALL_CMAKEDIR=${destroot}${prefix}/share/cmake/Modules \
</span> ESMF_INSTALL_MODDIR=${destroot}${prefix}/include/${name} \
ESMF_INSTALL_LIBDIR=${destroot}${prefix}/lib \
ESMF_INSTALL_BINDIR=${destroot}${prefix}/bin \
ESMF_INSTALL_DOCDIR=${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See note under build.env above, for ESMF_PIO=OFF.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove this when the other one is removed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append ESMF_PIO=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[variant_isset accelerate]} {
destroot.env-append ESMF_LAPACK=system \
ESMF_LAPACK_LIBS=-lvecLibFort
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,22 +197,6 @@ post-destroot {
</span> system -W ${destroot}${prefix}/lib "ranlib libesmf.a"
system -W ${destroot}${prefix}/lib "ranlib libesmftrace_static.a"
file delete ${destroot}${prefix}/lib/preload.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Adhoc fix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f {ESMF_PrintInfo ESMF_Regrid ESMF_Scrip2Unstruct \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_PrintInfoC ESMF_RegridWeightGen ESMF_WebServController} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot}${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "install_name_tool -change ${destroot}${prefix}/lib/libesmf.dylib ${prefix}/lib/libesmf.dylib ${f}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach l {gfortran.5 quadmath.0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot}${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "install_name_tool -change @rpath/lib${l}.dylib ${prefix}/lib/libgcc/lib${l}.dylib ${f}"
</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;'>- foreach f {esmf esmftrace_preload esmf_fullylinked} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot}${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "install_name_tool -change @rpath/libgfortran.5.dylib ${prefix}/lib/libgcc/libgfortran.5.dylib lib${f}.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot}${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "install_name_tool -change ${worksrcpath}/lib${f}.dylib ${prefix}/lib/lib${f}.dylib lib${f}.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
# Exclude pre-release candidates
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/esmf/files/install_name.patch b/science/esmf/files/install_name.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cf755a82985..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/esmf/files/install_name.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,70 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Set library install names at build time. This may not be the best method
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-but the build system is nonstandard and complicated and the best way may
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-require more restructuring tham I'm prepared to do.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Remove code that rewrites install names at install time which didn't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-work for several reasons:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-1. $(wildcard) was evaluated before the dylibs had been created so it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- expanded to the empty string unless you ran it a second time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2. The build system doesn't support DESTDIR so we include the dest dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- in the value of ESMF_INSTALL_LIBDIR so the rewritten install names
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- would contain the dest dir too
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-3. The wrong install names were baked into the executables when they
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- were built and there was no makefile code to rewrite them
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/common.mk.orig 2022-10-25 07:04:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/common.mk 2022-11-13 14:06:42.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1146,6 +1146,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_SL_SUFFIX = so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(ESMF_OS),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_SL_SUFFIX = dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ESMF_SL_LIBOPTS += -install_name $$INSTALLNAME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(ESMF_OS),Cygwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_SL_SUFFIX = dll.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3999,12 +4000,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -f $$NEXTLIB.$(ESMF_LIB_SUFFIX) ] ; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(ESMF_RM) $$NEXTLIB.$(ESMF_SL_SUFFIX) ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ INSTALLNAME=$(ESMF_INSTALL_LIBDIR_ABSPATH)/$$NEXTLIB.$(ESMF_SL_SUFFIX) ;\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo Converting $$NEXTLIB.a to $$NEXTLIB.$(ESMF_SL_SUFFIX) ;\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir tmp_$$NEXTLIB ;\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd tmp_$$NEXTLIB ;\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(ESMF_AREXTRACT) ../$$NEXTLIB.$(ESMF_LIB_SUFFIX) ;\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -o $(ESMF_LDIR)/$$NEXTLIB.$(ESMF_SL_SUFFIX) *.o $(ESMF_SL_LIBLIBS) ;\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -o $(ESMF_LDIR)/$$NEXTLIB.$(ESMF_SL_SUFFIX) *.o $(ESMF_SL_LIBLIBS) ;\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ INSTALLNAME=$(ESMF_INSTALL_LIBDIR_ABSPATH)/$$NEXTLIB\_fullylinked.$(ESMF_SL_SUFFIX) ;\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo Converting $$NEXTLIB.$(ESMF_SL_SUFFIX) to $$NEXTLIB\_fullylinked.$(ESMF_SL_SUFFIX) ;\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -o $(ESMF_LDIR)/$$NEXTLIB\_fullylinked.$(ESMF_SL_SUFFIX) *.o $(ESMF_CXXLINKOPTS) $(ESMF_CXXLINKPATHS) $(ESMF_CXXLINKRPATHS) $(ESMF_CXXLINKLIBS) ;\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -o $(ESMF_LDIR)/$$NEXTLIB\_fullylinked.$(ESMF_SL_SUFFIX) *.o $(ESMF_CXXLINKOPTS) $(ESMF_CXXLINKPATHS) $(ESMF_CXXLINKRPATHS) $(ESMF_CXXLINKLIBS) ;\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- makefile.orig 2022-10-25 07:04:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2022-11-13 20:37:08.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -705,17 +705,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(ESMF_PIO),internal)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -f $(ESMF_LIBDIR)/libpioc.* $(ESMF_INSTALL_LIBDIR_ABSPATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifneq (,$(filter $(ESMF_OS),Darwin DARWIN darwin))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @for lib in $(ESMF_INSTALL_LIBDIR_ABSPATH)/libesmf*.dylib foo ; do \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ $$lib != "foo" ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install_name_tool -id "$$lib" $$lib ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ $$lib == "$(ESMF_INSTALL_LIBDIR_ABSPATH)/libesmftrace_preload.dylib" ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install_name_tool -change "$(ESMF_LIBDIR)/libesmf.dylib" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "$(ESMF_INSTALL_LIBDIR_ABSPATH)/libesmf.dylib" $$lib; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(ESMF_TRACE_LIB_BUILD),ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(ESMF_TRACE_BUILD_SHARED),ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) ESMF_PRELOADDIR=$(ESMF_INSTALL_LIBDIR_ABSPATH) build_preload_script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Infrastructure/Trace/preload/makefile.orig 2021-10-26 16:39:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Infrastructure/Trace/preload/makefile 2022-04-25 19:25:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tracelib_preload: preload.o preload_io.o preload_mpi.o wrappers.o wrappers_io.o wrappers_mpi.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @INSTALLNAME=$(ESMF_INSTALL_LIBDIR_ABSPATH)/libesmftrace_preload.$(ESMF_SL_SUFFIX) ;\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo $(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -o $(ESMF_LDIR)/libesmftrace_preload.$(ESMF_SL_SUFFIX) $^ $(ESMF_CXXLINKOPTS) $(ESMF_CXXLINKPATHS) $(ESMF_CXXLINKRPATHS) $(ESMF_CXXLINKLIBS) $(ESMF_TRACE_ESMFLIB) ;\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -o $(ESMF_LDIR)/libesmftrace_preload.$(ESMF_SL_SUFFIX) $^ $(ESMF_CXXLINKOPTS) $(ESMF_CXXLINKPATHS) $(ESMF_CXXLINKRPATHS) $(ESMF_CXXLINKLIBS) $(ESMF_TRACE_ESMFLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) ESMF_PRELOADDIR=$(ESMF_LIBDIR) build_preload_script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>