<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/722eb792322a2e685d0e8e901853ecddab305f1b">https://github.com/macports/macports-ports/commit/722eb792322a2e685d0e8e901853ecddab305f1b</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 722eb792322 erlang: Fix compile-time crash on 10.6 and earlier
</span>722eb792322 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 722eb792322a2e685d0e8e901853ecddab305f1b
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Tue Jun 21 09:12:35 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> erlang: Fix compile-time crash on 10.6 and earlier
</span>---
lang/erlang/Portfile | 3 +++
.../patch-erts_emulator_sys_unix_sys_time.c.diff | 24 ++++++++++++++++++++++
2 files changed, 27 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/erlang/Portfile b/lang/erlang/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a854b229a5c..f7dee5218b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/erlang/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/erlang/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,6 +118,9 @@ platform darwin {
</span> # also "-framework Appkit"?
configure.ldflags-append -framework CoreFoundation
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} <= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-erts_emulator_sys_unix_sys_time.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant wxwidgets description {Build wxWidgets support} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/erlang/files/patch-erts_emulator_sys_unix_sys_time.c.diff b/lang/erlang/files/patch-erts_emulator_sys_unix_sys_time.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..646713a4889
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/erlang/files/patch-erts_emulator_sys_unix_sys_time.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix a crash on OS X 10.6 and earlier.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream: https://github.com/erlang/otp/pulls/6103
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- erts/emulator/sys/unix/sys_time.c.orig 2022-06-21 07:49:47.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ erts/emulator/sys/unix/sys_time.c 2022-06-21 07:51:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -219,7 +219,7 @@
</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;'>+ init_resp->os_monotonic_time_info.resolution = (Uint64) 1000*1000*1000;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(ERTS_HAVE_MACH_CLOCK_GETRES) && defined(MONOTONIC_CLOCK_ID)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(ERTS_HAVE_MACH_CLOCK_GETRES) && defined(OS_MONOTONIC_TIME_USING_MACH_CLOCK_GET_TIME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ init_resp->os_monotonic_time_info.resolution
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ = mach_clock_getres(&internal_state.r.o.mach.clock.monotonic);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(HAVE_CLOCK_GETRES) && defined(MONOTONIC_CLOCK_ID)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -379,7 +379,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ init_resp->os_system_time_info.locked_use = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ init_resp->os_system_time_info.resolution = (Uint64) 1000*1000*1000;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(ERTS_HAVE_MACH_CLOCK_GETRES) && defined(WALL_CLOCK_ID)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(ERTS_HAVE_MACH_CLOCK_GETRES) && defined(OS_SYSTEM_TIME_USING_MACH_CLOCK_GET_TIME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ init_resp->os_system_time_info.resolution
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ = mach_clock_getres(&internal_state.r.o.mach.clock.wall);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(HAVE_CLOCK_GETRES) && defined(WALL_CLOCK_ID)
</span></pre><pre style='margin:0'>
</pre>