<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f8c4616348665854c35c778efe96f85cdcf9700b">https://github.com/macports/macports-ports/commit/f8c4616348665854c35c778efe96f85cdcf9700b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f8c4616348665854c35c778efe96f85cdcf9700b
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Jul 6 23:07:58 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    ocaml-core_unix: use legacysupport correctly
</span>---
 ocaml/ocaml-core_unix/Portfile                     |  7 +++++-
 ...counter_stubs.c-add-legacysupport-header-.patch | 28 ++++------------------
 ...tubs.c-add-legacysupport-header-for-strnl.patch | 28 +++-------------------
 3 files changed, 13 insertions(+), 50 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-core_unix/Portfile b/ocaml/ocaml-core_unix/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7fde488d8a1..76435fbf8ff 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/ocaml-core_unix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/ocaml-core_unix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,11 +33,16 @@ depends_lib-append  port:ocaml-core \
</span>                     port:ocaml-spawn \
                     port:ocaml-timezone
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# FIXME: review the following.
</span> patch.pre_args-replace  -p0 -p1
 if {${os.platform} eq "darwin" && ${os.major} < 16} {
     patchfiles      0001-time_stamp_counter_stubs.c-add-legacysupport-header-.patch \
                     0002-core_unix_stubs.c-add-legacysupport-header-for-strnl.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${worksrcpath}/core_unix/src/dune \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${worksrcpath}/time_stamp_counter/src/dune
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 ocaml.build_type    dune
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-core_unix/files/0001-time_stamp_counter_stubs.c-add-legacysupport-header-.patch b/ocaml/ocaml-core_unix/files/0001-time_stamp_counter_stubs.c-add-legacysupport-header-.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 0024fe67b9a..a38ffe6f181 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/ocaml-core_unix/files/0001-time_stamp_counter_stubs.c-add-legacysupport-header-.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/ocaml-core_unix/files/0001-time_stamp_counter_stubs.c-add-legacysupport-header-.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,35 +4,15 @@ Date: Mon, 21 Nov 2022 01:08:19 +0800
</span> Subject: [PATCH 1/2] time_stamp_counter_stubs.c: add legacysupport header for
  clock_gettime
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- time_stamp_counter/src/time_stamp_counter_stubs.c | 5 +++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 5 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/time_stamp_counter/src/time_stamp_counter_stubs.c b/time_stamp_counter/src/time_stamp_counter_stubs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5d5ec32..1cf0ee1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/time_stamp_counter/src/time_stamp_counter_stubs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/time_stamp_counter/src/time_stamp_counter_stubs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,6 +17,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __MACH__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <mach/clock.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <mach/mach.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 101100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <LegacySupport/time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- #include "ocaml_utils.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> --- a/time_stamp_counter/src/dune 2023-04-25 21:12:26.000000000 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/time_stamp_counter/src/dune       2023-10-25 20:10:11.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/time_stamp_counter/src/dune  2024-07-06 22:52:24.000000000 +0800
</span> @@ -1,7 +1,7 @@
  (library (name time_stamp_counter) (public_name core_unix.time_stamp_counter)
   (preprocess (pps ppx_jane ppx_optcomp)) (preprocessor_deps config.h)
 - (c_names time_stamp_counter_stubs)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (c_names time_stamp_counter_stubs) (c_library_flags -lMacportsLegacySupport)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  (libraries core core_unix ocaml_intrinsics))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (libraries core core_unix ocaml_intrinsics))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (c_names time_stamp_counter_stubs) (c_flags -I@PREFIX@/include/LegacySupport)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (c_library_flags -lMacportsLegacySupport) (libraries core core_unix ocaml_intrinsics))
</span>  
  (rule (targets config.h) (deps)
 - (action (bash "cp %{lib:jst-config:config.h} %{targets}")))
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-core_unix/files/0002-core_unix_stubs.c-add-legacysupport-header-for-strnl.patch b/ocaml/ocaml-core_unix/files/0002-core_unix_stubs.c-add-legacysupport-header-for-strnl.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 72d9aca6626..5c29ba06b14 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/ocaml-core_unix/files/0002-core_unix_stubs.c-add-legacysupport-header-for-strnl.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/ocaml-core_unix/files/0002-core_unix_stubs.c-add-legacysupport-header-for-strnl.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,37 +3,15 @@ From: barracuda156 <vital.had@gmail.com>
</span> Date: Mon, 21 Nov 2022 01:13:02 +0800
 Subject: [PATCH 2/2] core_unix_stubs.c: add legacysupport header for strnlen
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- core_unix/src/core_unix_stubs.c | 7 +++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 7 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/core_unix/src/core_unix_stubs.c b/core_unix/src/core_unix_stubs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4beba77..20976d2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/core_unix/src/core_unix_stubs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/core_unix/src/core_unix_stubs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,6 +64,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <wordexp.h>
</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;'>-+#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <LegacySupport/string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- CAMLprim value core_unix_error_of_code(value code)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   return unix_error_of_code(Int_val(code));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> --- a/core_unix/src/dune  2023-04-25 21:12:26.000000000 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/core_unix/src/dune        2023-10-25 20:09:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/core_unix/src/dune   2024-07-06 22:50:49.000000000 +0800
</span> @@ -1,10 +1,10 @@
  (library (name core_unix) (public_name core_unix)
   (libraries core error_checking_mutex core_kernel.flags sexplib.unix
 -  signal_unix spawn)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- (c_flags (:standard -D_LARGEFILE64_SOURCE) ())
</span> +  signal_unix spawn) (c_library_flags -lMacportsLegacySupport)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  (c_flags (:standard -D_LARGEFILE64_SOURCE) ())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (c_flags (:standard -D_LARGEFILE64_SOURCE) -I@PREFIX@/include/LegacySupport ())
</span>   (c_names nss_stubs timespec core_unix_stubs core_unix_time_stubs)
   (preprocess (pps ppx_jane ppx_optcomp)) (preprocessor_deps config.h))
  
</pre><pre style='margin:0'>

</pre>