<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/639b42a5b680825c4599273eba0ab97522309a54">https://github.com/macports/macports-ports/commit/639b42a5b680825c4599273eba0ab97522309a54</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 639b42a5b68 libuv: update to 1.42.0
</span>639b42a5b68 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 639b42a5b680825c4599273eba0ab97522309a54
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Jul 20 16:43:14 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> libuv: update to 1.42.0
</span>---
devel/libuv/Portfile | 8 ++++----
devel/libuv/files/patch-libuv-unix-core-close-nocancel.diff | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libuv/Portfile b/devel/libuv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1db2bd31bb1..7b32efbc478 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libuv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libuv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,10 +69,10 @@ platform darwin {
</span> } else {
# 10.7 Lion and newer use the current release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup libuv libuv 1.41.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 bebb549b1d5d91c920ec586d8de062064acef70d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b16f35b00e8a34ef7310bad75e750b17cde2e8daf7330d023163b09d7cf4d2de \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1281646
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup libuv libuv 1.42.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 09e85ff38d67be34eb467ecb72d9a092de298ec8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1aa2d2b85899976f47313d80737a57cdac943ba39df993cfca36944ccbecaffa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1293521
</span> revision 0
patchfiles-append patch-libuv-unix-core-close-nocancel.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libuv/files/patch-libuv-unix-core-close-nocancel.diff b/devel/libuv/files/patch-libuv-unix-core-close-nocancel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4384f97270d..100bf8b061e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libuv/files/patch-libuv-unix-core-close-nocancel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libuv/files/patch-libuv-unix-core-close-nocancel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</span> --- src/unix/core.c.orig
+++ src/unix/core.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -527,18 +527,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -531,18 +531,31 @@
</span> * will unwind the thread when it's in the cancel state. Work around that
* by making the system call directly. Musl libc is unaffected.
*/
+
+#if defined(__GNUC__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GCC_VERSION \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define GCC_VERSION \
</span> + (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#endif
+#if defined(__clang__) || (defined(GCC_VERSION) && (GCC_VERSION >= 40500))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> -#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
-#if defined(__LP64__) || TARGET_OS_IPHONE
<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:#e0ffe0;'>++#if defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1050)
</span> +# if defined(GCC_DIAGNOSTIC_AVAILABLE)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +36,6 @@
</span> +# if defined(GCC_DIAGNOSTIC_AVAILABLE)
+# pragma GCC diagnostic pop
+# endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__linux__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return syscall(SYS_close, fd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__linux__) && defined(__SANITIZE_THREAD__) && defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long rc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __sanitizer_syscall_pre_close(fd);
</span></pre><pre style='margin:0'>
</pre>