<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch michaelld/cmake_libuv_tiger_tweak
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d4c802911efd2fc03b106b83cf4fe1c9e88c3fff">https://github.com/macports/macports-ports/commit/d4c802911efd2fc03b106b83cf4fe1c9e88c3fff</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d4c802911efd2fc03b106b83cf4fe1c9e88c3fff
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Dec 3 15:48:17 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> cmake: fix the libuv Tiger fix and make it global
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Ref: https://trac.macports.org/ticket/59808
</span>---
devel/cmake/Portfile | 4 +--
...buv-tiger.diff => patch-cmake-libuv.tiger.diff} | 35 ++++++++--------------
2 files changed, 14 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/Portfile b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c58438..0deac82 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +99,8 @@ if {${subport} eq ${name}} {
</span> patch-CMakeFindFrameworks.cmake.devel.diff \
patch-Source_Modules_FindLibUV.cmake.devel.diff \
patch-fix_cxx14_17_checks.devel.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-system-prefix-path.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-system-prefix-path.devel.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-libuv.tiger.diff
</span>
livecheck.type regex
livecheck.regex data-clipboard-text=\"(\[0-9a-g\]+)\"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,7 +179,6 @@ configure.post_args
</span> array set merger_host {i386 {} x86_64 {} ppc {} ppc64 {}}
platform darwin 8 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-cmake-3-12-libuv-tiger.diff
</span> configure.ldflags-append -Wl,-framework -Wl,ApplicationServices
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-cmake-3-12-libuv-tiger.diff b/devel/cmake/files/patch-cmake-libuv.tiger.diff
</span>similarity index 51%
rename from devel/cmake/files/patch-cmake-3-12-libuv-tiger.diff
rename to devel/cmake/files/patch-cmake-libuv.tiger.diff
<span style='display:block; white-space:pre;color:#808080;'>index 4b02494..31adf91 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-cmake-3-12-libuv-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-cmake-libuv.tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Utilities/cmlibuv/src/unix/core.c Utilities/cmlibuv/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a357ef3..135b7bb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Utilities/cmlibuv/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Utilities/cmlibuv/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1293,9 +1293,12 @@ int uv_os_unsetenv(const char* name) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Utilities/cmlibuv/src/unix/core.c.orig 2019-11-26 15:18:07.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Utilities/cmlibuv/src/unix/core.c 2019-12-03 17:41:11.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1306,9 +1306,12 @@
</span> if (name == NULL)
return UV_EINVAL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,38 +14,29 @@ index a357ef3..135b7bb 100644
</span> return 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Utilities/cmlibuv/src/unix/fs.c Utilities/cmlibuv/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a6cc6db..420490a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Utilities/cmlibuv/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Utilities/cmlibuv/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Utilities/cmlibuv/src/unix/fs.c.orig 2019-11-26 15:18:07.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Utilities/cmlibuv/src/unix/fs.c 2019-12-03 17:59:59.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,8 +59,8 @@
</span> # include <sys/sendfile.h>
#endif
-#if defined(__APPLE__)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <sys/sysctl.h>
</span> +#if ( defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 )
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <copyfile.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # include <copyfile.h>
</span> #elif defined(__linux__) && !defined(FICLONE)
# include <sys/ioctl.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -674,7 +674,7 @@ static ssize_t uv__fs_sendfile(uv_fs_t* req) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define FICLONE _IOW(0x94, 9, int)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -743,7 +743,7 @@
</span>
return -1;
}
-#elif defined(__APPLE__) || \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 || \
</span> defined(__DragonFly__) || \
defined(__FreeBSD__) || \
defined(__FreeBSD_kernel__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -825,7 +825,7 @@ done:
</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;'>- static ssize_t uv__fs_copyfile(uv_fs_t* req) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__) && !TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ( defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050) && !TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* On macOS, use the native copyfile(3). */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copyfile_flags_t flags;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -984,7 +984,7 @@ static void uv__to_stat(struct stat* src, uv_stat_t* dst) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1055,7 +1055,7 @@
</span> dst->st_blksize = src->st_blksize;
dst->st_blocks = src->st_blocks;
</pre><pre style='margin:0'>
</pre>