Browse Source

Merge topic 'libuv-kvm-bsd-dependency-removal' into release-4.0

4f0fb73816 libuv: Remove kvm dependency for all BSDs except NetBSD

Acked-by: Kitware Robot <[email protected]>
Merge-request: !10385
Brad King 9 months ago
parent
commit
24ccafab4f
2 changed files with 4 additions and 5 deletions
  1. 0 3
      Utilities/cmlibuv/CMakeLists.txt
  2. 4 2
      bootstrap

+ 0 - 3
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

+ 4 - 2
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"