CVS commit: pkgsrc/devel/lua-language-server

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sun Jul  7 14:00:18 UTC 2024

Modified Files:
        pkgsrc/devel/lua-language-server: distinfo
        pkgsrc/devel/lua-language-server/patches:
            patch-3rd_bee.lua_bee_thread_atomic__sync.cpp
Added Files:
        pkgsrc/devel/lua-language-server/patches:
            patch-3rd_luamake_bee.lua_bee_thread_atomic__sync.cpp

Log Message:
devel/lua-language-server: Fix fix for futex timespec misuse on NetBSD.

Was compile-testing on netbsd-9 which takes a different #ifdef branch.
Compile-tested the right branch this time.

No new revbump because either this doesn't affect the output, or it
wouldn't have built without this change anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/lua-language-server/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/lua-language-server/patches/patch-3rd_bee.lua_bee_thread_atomic__sync.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/lua-language-server/patches/patch-3rd_luamake_bee.lua_bee_thread_atomic__sync.cpp

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

Modified files:

Index: pkgsrc/devel/lua-language-server/distinfo
diff -u pkgsrc/devel/lua-language-server/distinfo:1.6 pkgsrc/devel/lua-language-server/distinfo:1.7
--- pkgsrc/devel/lua-language-server/distinfo:1.6       Sat Jul  6 10:57:00 2024
+++ pkgsrc/devel/lua-language-server/distinfo   Sun Jul  7 14:00:18 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2024/07/06 10:57:00 riastradh Exp $
+$NetBSD: distinfo,v 1.7 2024/07/07 14:00:18 riastradh Exp $
 
 BLAKE2s (CppCXY-EmmyLuaCodeStyle-660a26085ff2c1275392a291063404d54fdd32b9.tar.gz) = 00126b42aac3f95c6b64eab5e66c64ec00e87e9b435710667f8343e0916234cc
 SHA512 (CppCXY-EmmyLuaCodeStyle-660a26085ff2c1275392a291063404d54fdd32b9.tar.gz) = 
1ff267021d9c9daf53197cec1d5256dbd336ca19a17ef49ec7a2ac9ca34bff95ccf7da871dead34d7d270822b4f16f2b5e9066cbc7307c2c3f2092f5ff304503
@@ -27,5 +27,6 @@ Size (lua-language-server-3.8.3.tar.gz) 
 BLAKE2s (sqmedeiros-lpeglabel-912b0b9e8641074408ffc2259e069b188e0c717b.tar.gz) = 86a1e3cd622c2e6578a3d29dcce25bd7a9177b9d5d780d2de81d4c1a92355a61
 SHA512 (sqmedeiros-lpeglabel-912b0b9e8641074408ffc2259e069b188e0c717b.tar.gz) = 
ab84dad276f57092eee338ed00dc3656cc9a4a31f0ca4198ef3d1c169873af2f91756c4c4f92a0595d6fc109c2a07aae7495a4fdd658784f2420ad37bc3bf55c
 Size (sqmedeiros-lpeglabel-912b0b9e8641074408ffc2259e069b188e0c717b.tar.gz) = 83171 bytes
-SHA1 (patch-3rd_bee.lua_bee_thread_atomic__sync.cpp) = 7cc0b0fc4d157e842754c912a5129afb63c37560
+SHA1 (patch-3rd_bee.lua_bee_thread_atomic__sync.cpp) = aa909dfa24d21d32ecde88f31762340cc2dfc7da
+SHA1 (patch-3rd_luamake_bee.lua_bee_thread_atomic__sync.cpp) = 8353701ccfe7942a7d14c3de97b5de2a23111ebe
 SHA1 (patch-make.lua) = fba3453dbeecebc87e48b55bbefb580331cc5a5c

Index: pkgsrc/devel/lua-language-server/patches/patch-3rd_bee.lua_bee_thread_atomic__sync.cpp
diff -u pkgsrc/devel/lua-language-server/patches/patch-3rd_bee.lua_bee_thread_atomic__sync.cpp:1.1 pkgsrc/devel/lua-language-server/patches/patch-3rd_bee.lua_bee_thread_atomic__sync.cpp:1.2
--- pkgsrc/devel/lua-language-server/patches/patch-3rd_bee.lua_bee_thread_atomic__sync.cpp:1.1  Sat Jul  6 10:57:00 2024
+++ pkgsrc/devel/lua-language-server/patches/patch-3rd_bee.lua_bee_thread_atomic__sync.cpp      Sun Jul  7 14:00:18 2024
@@ -1,18 +1,17 @@
-$NetBSD: patch-3rd_bee.lua_bee_thread_atomic__sync.cpp,v 1.1 2024/07/06 10:57:00 riastradh Exp $
+$NetBSD: patch-3rd_bee.lua_bee_thread_atomic__sync.cpp,v 1.2 2024/07/07 14:00:18 riastradh Exp $
 
 https://github.com/actboy168/bee.lua/pull/50
 
 --- 3rd/bee.lua/bee/thread/atomic_sync.cpp.orig        2024-04-23 08:56:20.000000000 +0000
 +++ 3rd/bee.lua/bee/thread/atomic_sync.cpp
-@@ -50,7 +50,11 @@ static void futex_wait(const int* ptr, i
+@@ -50,7 +50,10 @@ static void futex_wait(const int* ptr, i
  #    if defined(__linux__)
      ::syscall(SYS_futex, ptr, FUTEX_WAIT | FUTEX_PRIVATE_FLAG, val, timeout, 0, 0);
  #    elif defined(__NetBSD__)
 -    ::syscall(SYS___futex, ptr, FUTEX_WAIT | FUTEX_PRIVATE_FLAG, val, timeout, 0, 0, 0);
-+    struct timespec ts = {
-+        .tv_sec = timeout.tv_sec,
-+        .tv_nsec = timeout.tv,
-+    };
++    struct timespec ts;
++    ts.tv_sec = timeout->tv_sec;
++    ts.tv_nsec = timeout->tv_nsec;
 +    ::syscall(SYS___futex, ptr, FUTEX_WAIT | FUTEX_PRIVATE_FLAG, val, &ts, 0, 0, 0);
  #    elif defined(__OpenBSD__)
      static_assert(sizeof(FutexTimespec) == sizeof(timespec));

Added files:

Index: pkgsrc/devel/lua-language-server/patches/patch-3rd_luamake_bee.lua_bee_thread_atomic__sync.cpp
diff -u /dev/null pkgsrc/devel/lua-language-server/patches/patch-3rd_luamake_bee.lua_bee_thread_atomic__sync.cpp:1.1
--- /dev/null   Sun Jul  7 14:00:18 2024
+++ pkgsrc/devel/lua-language-server/patches/patch-3rd_luamake_bee.lua_bee_thread_atomic__sync.cpp      Sun Jul  7 14:00:18 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-3rd_luamake_bee.lua_bee_thread_atomic__sync.cpp,v 1.1 2024/07/07 14:00:18 riastradh Exp $
+
+https://github.com/actboy168/bee.lua/pull/50
+
+--- 3rd/luamake/bee.lua/bee/thread/atomic_sync.cpp.orig        2024-04-23 01:38:34.000000000 +0000
++++ 3rd/luamake/bee.lua/bee/thread/atomic_sync.cpp
+@@ -50,7 +50,10 @@ static void futex_wait(const int* ptr, i
+ #    if defined(__linux__)
+     ::syscall(SYS_futex, ptr, FUTEX_WAIT | FUTEX_PRIVATE_FLAG, val, timeout, 0, 0);
+ #    elif defined(__NetBSD__)
+-    ::syscall(SYS___futex, ptr, FUTEX_WAIT | FUTEX_PRIVATE_FLAG, val, timeout, 0, 0, 0);
++    struct timespec ts;
++    ts.tv_sec = timeout->tv_sec;
++    ts.tv_nsec = timeout->tv_nsec;
++    ::syscall(SYS___futex, ptr, FUTEX_WAIT | FUTEX_PRIVATE_FLAG, val, &ts, 0, 0, 0);
+ #    elif defined(__OpenBSD__)
+     static_assert(sizeof(FutexTimespec) == sizeof(timespec));
+     ::futex((uint32_t*)const_cast<int*>(ptr), FUTEX_WAIT | FUTEX_PRIVATE_FLAG, val, (const timespec*)timeout, 0);