head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.14 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.12 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.10 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.8 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.6 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.4 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.2 pkgsrc-2024Q3-base:1.2; locks; strict; comment @// @; 1.2 date 2024.07.07.14.00.18; author riastradh; state Exp; branches; next 1.1; commitid 7y9BB0CIWgHDDUgF; 1.1 date 2024.07.06.10.57.00; author riastradh; state Exp; branches; next ; commitid kdEqmNSjy94KELgF; desc @@ 1.2 log @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. @ text @$NetBSD: patch-3rd_bee.lua_bee_thread_atomic__sync.cpp,v 1.1 2024/07/06 10:57:00 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,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(ptr), FUTEX_WAIT | FUTEX_PRIVATE_FLAG, val, (const timespec*)timeout, 0); @ 1.1 log @devel/lua-language-server: Fix futex timespec misuse on NetBSD. @ text @d1 1 a1 1 $NetBSD$ d7 1 a7 1 @@@@ -50,7 +50,11 @@@@ static void futex_wait(const int* ptr, i d12 3 a14 4 + struct timespec ts = { + .tv_sec = timeout.tv_sec, + .tv_nsec = timeout.tv, + }; @