From 4f0fb73816caad8efd6278887b584dde9493687d Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Sat, 22 Feb 2025 17:41:58 +0000 Subject: libuv: Remove kvm dependency for all BSDs except NetBSD This dependency is not expressed in upstream libuv. It was added to CMake by commit 6a497bb0a3 (libuv: Link with kvm on FreeBSD, 2016-09-08, v3.7.0-rc1~143^2~1). It is needed only on NetBSD. Fixes: #26722 --- Utilities/cmlibuv/CMakeLists.txt | 3 --- bootstrap | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt index 8773e56..69e31e9 100644 --- a/Utilities/cmlibuv/CMakeLists.txt +++ b/Utilities/cmlibuv/CMakeLists.txt @@ -219,7 +219,6 @@ endif() if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") list(APPEND uv_libraries - kvm ) list(APPEND uv_headers include/uv/bsd.h @@ -236,7 +235,6 @@ endif() if(CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD") list(APPEND uv_libraries freebsd-glue - kvm ) list(APPEND uv_headers include/uv/bsd.h @@ -268,7 +266,6 @@ endif() if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") list(APPEND uv_libraries - kvm ) list(APPEND uv_headers include/uv/bsd.h diff --git a/bootstrap b/bootstrap index a1ab850..644260b 100755 --- a/bootstrap +++ b/bootstrap @@ -1783,11 +1783,13 @@ else libs="${libs} -ldl -lrt" ;; *kFreeBSD*) - libs="${libs} -lkvm -lfreebsd-glue" + libs="${libs} -lfreebsd-glue" ;; - *BSD*) + *NetBSD*) libs="${libs} -lkvm" ;; + *BSD*) + ;; *SunOS*) uv_c_flags="${uv_c_flags} -D__EXTENSIONS__ -D_XOPEN_SOURCE=600" libs="${libs} -lkstat -lnsl -lsendfile -lsocket -lrt" -- cgit v0.12