CVS commit: pkgsrc/devel/libuv

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Fri Sep 19 07:06:49 UTC 2025

Modified Files:
        pkgsrc/devel/libuv: distinfo
        pkgsrc/devel/libuv/patches: patch-src_unix_core.c

Log Message:
fix the cpuset_t handling on netbsd.

sched_getaffinity_np() takes the cpuset_t* not a pointer to it.
it also takes a count (cpuset_size()), not the size of the pointer.
uv__cpu_count() also doesn't want a pointer to the pointer.

found my GCC 14.

i wonder what makes weird or breaks.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 pkgsrc/devel/libuv/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libuv/patches/patch-src_unix_core.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libuv/distinfo
diff -u pkgsrc/devel/libuv/distinfo:1.85 pkgsrc/devel/libuv/distinfo:1.86
--- pkgsrc/devel/libuv/distinfo:1.85    Mon Apr 28 05:53:02 2025
+++ pkgsrc/devel/libuv/distinfo Fri Sep 19 07:06:49 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.85 2025/04/28 05:53:02 adam Exp $
+$NetBSD: distinfo,v 1.86 2025/09/19 07:06:49 mrg Exp $
 
 BLAKE2s (libuv-1.51.0.tar.gz) = 4fb27415211b4d6b0bed33452f9ac29f36b9c90c5d48ddd0a7d16cd3d842139c
 SHA512 (libuv-1.51.0.tar.gz) = cf3ca916fc3a762a194dac86718a5a7fe24f230e34172a48f9b3401ad72fbc1cf21b46ceaba956cdf6783d323e518d40f8632fff965943869819a1c26992a3c1
 Size (libuv-1.51.0.tar.gz) = 1352232 bytes
 SHA1 (patch-autogen.sh) = 99790076b91d579eb55506749e4803ab7cdfaa4c
-SHA1 (patch-src_unix_core.c) = 2daf6aeed2d32b0db49c36cf7c129d7f7962178e
+SHA1 (patch-src_unix_core.c) = 1b1bb19b185f87aeb54aca3dcfedb1cd0978c384
 SHA1 (patch-src_unix_fs.c) = 510693bb63cac7bf25e04c64e2d231de80b149d1
 SHA1 (patch-src_unix_netbsd.c) = 071a2a853f9a73dc72e24d63316aa21b28669469
 SHA1 (patch-src_unix_tty.c) = 157be1b1272dc38b3605a9822316e6cb2ddb6f22

Index: pkgsrc/devel/libuv/patches/patch-src_unix_core.c
diff -u pkgsrc/devel/libuv/patches/patch-src_unix_core.c:1.3 pkgsrc/devel/libuv/patches/patch-src_unix_core.c:1.4
--- pkgsrc/devel/libuv/patches/patch-src_unix_core.c:1.3        Sun Oct 13 07:48:02 2024
+++ pkgsrc/devel/libuv/patches/patch-src_unix_core.c    Fri Sep 19 07:06:49 2025
@@ -1,13 +1,15 @@
-$NetBSD: patch-src_unix_core.c,v 1.3 2024/10/13 07:48:02 wiz Exp $
+$NetBSD: patch-src_unix_core.c,v 1.4 2025/09/19 07:06:49 mrg Exp $
 
 Apply MacPorts patch-libuv-unix-core-close-nocancel.diff for
 - older gcc versions to not error on pragmas
 - 32bit code to link correctly
 - Tiger to work around not having a non-cancellable close function
 
---- src/unix/core.c.orig       2024-09-25 08:17:20.000000000 +0000
-+++ src/unix/core.c
-@@ -595,18 +595,31 @@ int uv__accept(int sockfd) {
+Also fix NetBSD cpuset handling.
+
+--- src/unix/core.c.orig       2025-04-25 02:50:27.000000000 -0700
++++ src/unix/core.c    2025-09-19 00:00:12.596197154 -0700
+@@ -597,18 +597,31 @@
   * will unwind the thread when it's in the cancel state. Work around that
   * by making the system call directly. Musl libc is unaffected.
   */
@@ -46,3 +48,14 @@ Apply MacPorts patch-libuv-unix-core-clo
  #elif defined(__linux__) && defined(__SANITIZE_THREAD__) && defined(__clang__)
    long rc;
    __sanitizer_syscall_pre_close(fd);
+@@ -1998,8 +2011,8 @@
+ #elif defined(__NetBSD__)
+   cpuset_t* set = cpuset_create();
+   if (set != NULL) {
+-    if (0 == sched_getaffinity_np(getpid(), sizeof(set), &set))
+-      rc = uv__cpu_count(&set);
++    if (0 == sched_getaffinity_np(getpid(), cpuset_size(set), set))
++      rc = uv__cpu_count(set);
+     cpuset_destroy(set);
+   }
+ #elif defined(__APPLE__)