<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/be1094bc8810d5776303041e34ae5e022fd755b4">https://github.com/macports/macports-ports/commit/be1094bc8810d5776303041e34ae5e022fd755b4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit be1094bc8810d5776303041e34ae5e022fd755b4
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Mar 24 16:18:47 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> cmake-devel: update libuv patchfile
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> force fork behaviour on all systems < 10.8
</span><span style='display:block; white-space:pre;color:#404040;'> see https://trac.macports.org/ticket/67540
</span><span style='display:block; white-space:pre;color:#404040;'> see https://trac.macports.org/ticket/68718
</span>---
devel/cmake-devel/Portfile | 2 +-
.../files/patch-libuv-legacy-systems.diff | 61 ++++++++++++++++++++++
devel/cmake-devel/files/patch-uv_spawn.diff | 46 ----------------
3 files changed, 62 insertions(+), 47 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/Portfile b/devel/cmake-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b3c4f9a8e72..19db95d0067 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,7 +87,7 @@ patchfiles-append \
</span> patch-fix-clock_gettime-test.diff \
patch-qt5gui.diff \
patch-cmake-cmInstallRuntime-initializer-fix.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-uv_spawn.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libuv-legacy-systems.diff \
</span> patch-cmakeroot-with-app.diff \
patch-remove-homebrew-references.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-libuv-legacy-systems.diff b/devel/cmake-devel/files/patch-libuv-legacy-systems.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f8debd5cc1a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/files/patch-libuv-legacy-systems.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,61 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# force libuv to use the older fork method rather than the newer spawn method
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# of process execution on older systems. Although older systems 10.5 and newer do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# support posix_spawn, the implementation used in libuv is not working well on these
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# older systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/67540
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/68718
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and related issues referenced in those tickets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and add some minor older system tweaks needed from the libuv port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Utilities/cmlibuv/src/unix/process.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Utilities/cmlibuv/src/unix/process.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sched.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <spawn.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <paths.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <sys/kauth.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -428,7 +431,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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct uv__posix_spawn_fncs_tag {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (*addchdir_np)(const posix_spawn_file_actions_t *, const char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -880,7 +885,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int exec_errorno;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssize_t r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uv_once(&posix_spawn_init_once, uv__spawn_init_posix_spawn);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Special child process spawn case for macOS Big Sur (11.0) onwards
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Utilities/cmlibuv/src/unix/udp.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Utilities/cmlibuv/src/unix/udp.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -944,6 +944,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__ANDROID__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__DragonFly__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__QNX__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (!defined(__APPLE__) || (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__GNU__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int uv__udp_set_source_membership4(uv_udp_t* handle,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const struct sockaddr_in* multicast_addr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1137,6 +1138,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__ANDROID__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__DragonFly__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__QNX__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (!defined(__APPLE__) || (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__GNU__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ union uv__sockaddr mcast_addr;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-uv_spawn.diff b/devel/cmake-devel/files/patch-uv_spawn.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e57c4114e32..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake-devel/files/patch-uv_spawn.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,46 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Undefined symbols: "_posix_spawn_file_actions_addinherit_np",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# referenced from: _uv_spawn in uv-src-unix-process.c.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Utilities/cmlibuv/src/unix/process.c.orig 2022-10-19 23:22:54.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Utilities/cmlibuv/src/unix/process.c 2022-10-23 08:17:02.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,7 +37,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sched.h>
</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 >= 1050
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <spawn.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <paths.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <sys/kauth.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -428,7 +431,7 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct uv__posix_spawn_fncs_tag {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int (*addchdir_np)(const posix_spawn_file_actions_t *, const char *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -629,9 +632,11 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fd == use_fd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- err = posix_spawn_file_actions_addinherit_np(actions, fd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- err = posix_spawn_file_actions_adddup2(actions, use_fd, fd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(err != ENOSYS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (err != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -880,7 +885,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int exec_errorno;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ssize_t r;
</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;'>-+#if defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uv_once(&posix_spawn_init_once, uv__spawn_init_posix_spawn);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Special child process spawn case for macOS Big Sur (11.0) onwards
</span></pre><pre style='margin:0'>
</pre>