<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/7c9beaf9b82a77e7f02b8240fbdddc73f583740e">https://github.com/macports/macports-ports/commit/7c9beaf9b82a77e7f02b8240fbdddc73f583740e</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 7c9beaf cmake: fix build on Tiger
</span>7c9beaf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7c9beaf9b82a77e7f02b8240fbdddc73f583740e
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Tue Nov 13 12:14:00 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> cmake: fix build on Tiger
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> with newly-fixed libuv, now can use system libs again
</span><span style='display:block; white-space:pre;color:#404040;'> add fixes for cm_libuv to allow bootstrap cmake to build
</span><span style='display:block; white-space:pre;color:#404040;'> add a missing link library
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/55415
</span>---
devel/cmake/Portfile | 14 +-----
.../cmake/files/patch-cmake-3-12-libuv-tiger.diff | 58 ++++++++++++++++++++++
2 files changed, 60 insertions(+), 12 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 d74ac7f..ef41d66 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;'>@@ -161,19 +161,9 @@ configure.post_args
</span> # CMake's configure script doesn't recognize `--host`.
array set merger_host {i386 {} x86_64 {} ppc {} ppc64 {}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Tiger has issues with system libraries;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# just use the ones internal to cmake instead.
</span> platform darwin 8 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --system-libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --no-system-libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/libuv.pc:libuv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:curl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:expat \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bzip2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libarchive \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-cmake-3-12-libuv-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -Wl,-framework -Wl,ApplicationServices
</span> }
# Leopard's Rosetta has some difficulties configuring the ppc slice
<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-3-12-libuv-tiger.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4b02494
</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-3-12-libuv-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,58 @@
</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 a357ef3..135b7bb 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;'>+@@ -1293,9 +1293,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;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+
</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 a6cc6db..420490a 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;'>+@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <sys/sendfile.h>
</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(__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;'>+ # include <copyfile.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__linux__) && !defined(FICLONE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <sys/ioctl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -674,7 +674,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;'>+@@ -825,7 +825,7 @@ done:
</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;'>+ static ssize_t uv__fs_copyfile(uv_fs_t* req) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__) && !TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if ( defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050) && !TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* On macOS, use the native copyfile(3). */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copyfile_flags_t flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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;'>+ 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></pre><pre style='margin:0'>
</pre>