<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/bece9af79a3a72be79a1e09542d81ef5e498736a">https://github.com/macports/macports-ports/commit/bece9af79a3a72be79a1e09542d81ef5e498736a</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 bece9af79a3 esmf: fix build for 10.6-10.8
</span>bece9af79a3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bece9af79a3a72be79a1e09542d81ef5e498736a
</span>Author: Dave Allured <dave.allured@noaa.gov>
AuthorDate: Sun May 4 19:09:00 2025 -0600
<span style='display:block; white-space:pre;color:#404040;'> esmf: fix build for 10.6-10.8
</span>---
science/esmf/Portfile | 7 +++
science/esmf/files/patch-task_vm_info_missing.diff | 51 ++++++++++++++++++++++
2 files changed, 58 insertions(+)
<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 54d80091701..7bc55592e28 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;'>@@ -35,6 +35,13 @@ long_description ESMF defines an architecture for composing complex, coupled
</span> homepage https://earthsystemmodeling.org
github.tarball_from archive
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix builds for 10.6-10.8.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Was fixed upstream after ESMF version 8.8.1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove this patch on next release after 8.8.1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fixes unknown 'task_info_data_t', 'TASK_VM_INFO_COUNT', 'TASK_VM_INFO'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch copied from upstream patch by @barracuda156.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-task_vm_info_missing.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build bin:ranlib:cctools
depends_lib port:netcdf \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/esmf/files/patch-task_vm_info_missing.diff b/science/esmf/files/patch-task_vm_info_missing.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3e8c82d86f6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/esmf/files/patch-task_vm_info_missing.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,51 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix for unknown 'task_info_data_t', 'TASK_VM_INFO_COUNT', 'TASK_VM_INFO'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ on MacOS <= 10.8.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+New task info support was added in MacOS 10.9.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This patch applies only to ESMF versions <= 8.8.1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Was fixed upstream. Remove this patch on next release after 8.8.1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Copied from upstream patch on ESMF 8.8.1 by @barracuda156:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/esmf-org/esmf/pull/395
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/Infrastructure/VM/src/ESMCI_VM.C b/src/Infrastructure/VM/src/ESMCI_VM.C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3b0ea7ae13..e61ab17848 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Infrastructure/VM/src/ESMCI_VM.C.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Infrastructure/VM/src/ESMCI_VM.C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,6 +52,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (defined ESMF_OS_Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mach/mach.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ESMF_Pthread.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ESMCI_IO_Handler.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2770,6 +2771,7 @@ void VM::logMemInfo(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log->Write(msg, msgType);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif (defined ESMF_OS_Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Get memory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ task_vm_info_data_t mem_info;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mach_msg_type_number_t size = TASK_VM_INFO_COUNT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kern_return_t kerr = task_info(mach_task_self(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2808,6 +2810,21 @@ void VM::logMemInfo(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log->Write(msg, msgType);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Fallback for earlier systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ task_basic_info mem_info;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_msg_type_number_t size = TASK_BASIC_INFO_COUNT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kern_return_t kerr = task_info(mach_task_self(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TASK_BASIC_INFO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (task_info_t)&mem_info,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ &size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( kerr == KERN_SUCCESS ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sprintf(msg, "%s - MemInfo: VmRSS: \t%d (bytes)",prefix.c_str(),mem_info.resident_size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log->Write(msg, msgType);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sprintf(msg, "%s - MemInfo: Total allocated space (bytes): \t%d",prefix.c_str(),mem_info.virtual_size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log->Write(msg, msgType);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // output the wtime since execution start
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double wt;
</span></pre><pre style='margin:0'>
</pre>