<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cf6e913039d8bfafa4c4c9e2ec994ce83888f311">https://github.com/macports/macports-ports/commit/cf6e913039d8bfafa4c4c9e2ec994ce83888f311</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 cf6e913 cmake: fix build on tiger and leopard
</span>cf6e913 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cf6e913039d8bfafa4c4c9e2ec994ce83888f311
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Fri Dec 13 09:28:47 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> cmake: fix build on tiger and leopard
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> freshen patches
</span><span style='display:block; white-space:pre;color:#404040;'> add missing header
</span>---
devel/cmake/Portfile | 3 +-
.../files/patch-cmake-leopard-tiger.devel.diff | 119 +++++++++++++++++++++
.../files/patch-cmake-leopard-tiger.release.diff | 119 +++++++++++++++++++++
devel/cmake/files/patch-cmake-libuv.tiger.diff | 47 --------
4 files changed, 240 insertions(+), 48 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 11bd5e2..84110ae 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;'>@@ -70,6 +70,7 @@ if {${subport} eq ${name}} {
</span> patch-Source_Modules_FindLibUV.cmake.release.diff \
patch-fix_cxx14_17_checks.release.diff \
patch-fix-system-prefix-path.release.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-leopard-tiger.release.diff \
</span> patch-fix-feature-test.release.diff
livecheck.type regex
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,7 +104,7 @@ if {${subport} eq ${name}} {
</span> patch-Source_Modules_FindLibUV.cmake.devel.diff \
patch-fix_cxx14_17_checks.devel.diff \
patch-fix-system-prefix-path.devel.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-libuv.tiger.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-leopard-tiger.devel.diff
</span>
livecheck.type regex
livecheck.regex data-clipboard-text=\"(\[0-9a-g\]+)\"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-cmake-leopard-tiger.devel.diff b/devel/cmake/files/patch-cmake-leopard-tiger.devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ce70486
</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/files/patch-cmake-leopard-tiger.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,119 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+kencu@macports.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The <memory> header seems to be needed if building with gcc/libstdc++ on MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+adding it does no harm to clang/libc++ builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+it must be somehow automatically included with the libc++ headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/cmMachO.h Source/cmMachO.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0c44b55..06c39db 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/cmMachO.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/cmMachO.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,6 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iosfwd>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <memory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(CMAKE_USE_MACH_PARSER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # error "This file may be included only if CMAKE_USE_MACH_PARSER is enabled."
</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;'>+kencu@macports.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The patches below match the tiger patches in the libuv port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Although cmake is configured to use the system libuv, it appears that the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bootstrap version of cmake uses a more current version, and that is a moving
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+target as libuv advances.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+At some point we may have to switch to an older bootstrap version of cmake,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if libuv becomes too difficult to keep up-to-date.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Utilities/cmlibuv/src/unix/core.c Utilities/cmlibuv/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cf7dea0..b48ca73 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Utilities/cmlibuv/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Utilities/cmlibuv/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -525,10 +525,24 @@ skip:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * will unwind the thread when it's in the cancel state. Work around that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * by making the system call directly. Musl libc is unaffected.
</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(__GNUC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GCC_VERSION \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__clang__) || (defined(GCC_VERSION) && (GCC_VERSION >= 40500))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* gcc diagnostic pragmas available */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define GCC_DIAGNOSTIC_AVAILABLE
</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;'>+ int uv__close_nocancel(int fd) {
</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_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(GCC_DIAGNOSTIC_AVAILABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
</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;'>+ #if defined(__LP64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int close$NOCANCEL(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return close$NOCANCEL(fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -536,7 +550,11 @@ int uv__close_nocancel(int fd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int close$NOCANCEL$UNIX2003(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return close$NOCANCEL$UNIX2003(fd);
</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;'>++#if defined(GCC_DIAGNOSTIC_AVAILABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma GCC diagnostic pop
</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;'>+ #elif defined(__linux__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return syscall(SYS_close, fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1306,8 +1324,12 @@ int uv_os_unsetenv(const char* name) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (name == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return UV_EINVAL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if ( defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsetenv(name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (unsetenv(name) != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return UV__ERR(errno);
</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;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Utilities/cmlibuv/src/unix/fs.c Utilities/cmlibuv/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5fb34f1..7453980 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Utilities/cmlibuv/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Utilities/cmlibuv/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -743,7 +743,7 @@ static ssize_t uv__fs_sendfile(uv_fs_t* req) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__APPLE__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__DragonFly__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__FreeBSD__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__FreeBSD_kernel__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1055,7 +1055,7 @@ static void uv__to_stat(struct stat* src, uv_stat_t* dst) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst->st_blksize = src->st_blksize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst->st_blocks = src->st_blocks;
</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_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst->st_atim.tv_sec = src->st_atimespec.tv_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst->st_atim.tv_nsec = src->st_atimespec.tv_nsec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst->st_mtim.tv_sec = src->st_mtimespec.tv_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Utilities/cmlibuv/src/unix/tty.c Utilities/cmlibuv/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index db479d6..5a7a86b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Utilities/cmlibuv/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Utilities/cmlibuv/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,7 @@ static int uv__tty_is_slave(const int fd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int dummy;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = ioctl(fd, TIOCGPTN, &dummy) != 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char dummy[256];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = ioctl(fd, TIOCPTYGNAME, &dummy) != 0;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-cmake-leopard-tiger.release.diff b/devel/cmake/files/patch-cmake-leopard-tiger.release.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ce70486
</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/files/patch-cmake-leopard-tiger.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,119 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+kencu@macports.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The <memory> header seems to be needed if building with gcc/libstdc++ on MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+adding it does no harm to clang/libc++ builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+it must be somehow automatically included with the libc++ headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/cmMachO.h Source/cmMachO.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0c44b55..06c39db 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/cmMachO.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/cmMachO.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,6 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iosfwd>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <memory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(CMAKE_USE_MACH_PARSER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # error "This file may be included only if CMAKE_USE_MACH_PARSER is enabled."
</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;'>+kencu@macports.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The patches below match the tiger patches in the libuv port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Although cmake is configured to use the system libuv, it appears that the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bootstrap version of cmake uses a more current version, and that is a moving
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+target as libuv advances.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+At some point we may have to switch to an older bootstrap version of cmake,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if libuv becomes too difficult to keep up-to-date.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Utilities/cmlibuv/src/unix/core.c Utilities/cmlibuv/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cf7dea0..b48ca73 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Utilities/cmlibuv/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Utilities/cmlibuv/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -525,10 +525,24 @@ skip:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * will unwind the thread when it's in the cancel state. Work around that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * by making the system call directly. Musl libc is unaffected.
</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(__GNUC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GCC_VERSION \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__clang__) || (defined(GCC_VERSION) && (GCC_VERSION >= 40500))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* gcc diagnostic pragmas available */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define GCC_DIAGNOSTIC_AVAILABLE
</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;'>+ int uv__close_nocancel(int fd) {
</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_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(GCC_DIAGNOSTIC_AVAILABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
</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;'>+ #if defined(__LP64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int close$NOCANCEL(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return close$NOCANCEL(fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -536,7 +550,11 @@ int uv__close_nocancel(int fd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int close$NOCANCEL$UNIX2003(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return close$NOCANCEL$UNIX2003(fd);
</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;'>++#if defined(GCC_DIAGNOSTIC_AVAILABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma GCC diagnostic pop
</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;'>+ #elif defined(__linux__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return syscall(SYS_close, fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1306,8 +1324,12 @@ int uv_os_unsetenv(const char* name) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (name == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return UV_EINVAL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if ( defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsetenv(name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (unsetenv(name) != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return UV__ERR(errno);
</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;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Utilities/cmlibuv/src/unix/fs.c Utilities/cmlibuv/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5fb34f1..7453980 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Utilities/cmlibuv/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Utilities/cmlibuv/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -743,7 +743,7 @@ static ssize_t uv__fs_sendfile(uv_fs_t* req) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__APPLE__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__DragonFly__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__FreeBSD__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__FreeBSD_kernel__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1055,7 +1055,7 @@ static void uv__to_stat(struct stat* src, uv_stat_t* dst) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst->st_blksize = src->st_blksize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst->st_blocks = src->st_blocks;
</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_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst->st_atim.tv_sec = src->st_atimespec.tv_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst->st_atim.tv_nsec = src->st_atimespec.tv_nsec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst->st_mtim.tv_sec = src->st_mtimespec.tv_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Utilities/cmlibuv/src/unix/tty.c Utilities/cmlibuv/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index db479d6..5a7a86b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Utilities/cmlibuv/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Utilities/cmlibuv/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,7 @@ static int uv__tty_is_slave(const int fd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int dummy;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = ioctl(fd, TIOCGPTN, &dummy) != 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char dummy[256];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = ioctl(fd, TIOCPTYGNAME, &dummy) != 0;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-cmake-libuv.tiger.diff b/devel/cmake/files/patch-cmake-libuv.tiger.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 31adf91..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-cmake-libuv.tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Utilities/cmlibuv/src/unix/core.c.orig 2019-11-26 15:18:07.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Utilities/cmlibuv/src/unix/core.c 2019-12-03 17:41:11.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1306,9 +1306,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (name == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return UV_EINVAL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ( defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unsetenv(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (unsetenv(name) != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return UV__ERR(errno);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</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;'>---- Utilities/cmlibuv/src/unix/fs.c.orig 2019-11-26 15:18:07.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Utilities/cmlibuv/src/unix/fs.c 2019-12-03 17:59:59.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,8 +59,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <sys/sendfile.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 <sys/sysctl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ( defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include <copyfile.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__linux__) && !defined(FICLONE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <sys/ioctl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define FICLONE _IOW(0x94, 9, int)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -743,7 +743,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__APPLE__) || \
</span><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:#ffe0e0;'>- defined(__DragonFly__) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- defined(__FreeBSD__) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- defined(__FreeBSD_kernel__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1055,7 +1055,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dst->st_blksize = src->st_blksize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dst->st_blocks = src->st_blocks;
</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_MAX_ALLOWED >= 1050)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dst->st_atim.tv_sec = src->st_atimespec.tv_sec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dst->st_atim.tv_nsec = src->st_atimespec.tv_nsec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dst->st_mtim.tv_sec = src->st_mtimespec.tv_sec;
</span></pre><pre style='margin:0'>
</pre>