From 22fc92856d8a354b7f26ca7fe2d3597a2bd57865 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Fri, 12 May 2017 23:25:06 -0400 Subject: [PATCH] build,openbsd: remove kvm-related code Remove the kvm.h include since 38323c9fb replaced the use of kvm_open() with sysctl(), Conditionally check for kvm_open() on non-OpenBSD platforms so LIBS (and libuv.pc) does not unnecessarily contain "-lkvm". Fixes: https://github.com/libuv/libuv/issues/1340 PR-URL: https://github.com/libuv/libuv/pull/1344 Reviewed-By: Santiago Gimeno --- configure.ac | 4 +++- src/unix/openbsd.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 6ec3125c..963b4f15 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,6 @@ LT_INIT # TODO(bnoordhuis) Check for -pthread vs. -pthreads AC_CHECK_LIB([dl], [dlopen]) AC_CHECK_LIB([kstat], [kstat_lookup]) -AC_CHECK_LIB([kvm], [kvm_open]) AC_CHECK_LIB([nsl], [gethostbyname]) AC_CHECK_LIB([perfstat], [perfstat_cpu]) AC_CHECK_LIB([pthread], [pthread_mutex_init]) @@ -65,6 +64,9 @@ AM_CONDITIONAL([WINNT], [AS_CASE([$host_os],[mingw*], [true], [false]) AS_CASE([$host_os],[mingw*], [ LIBS="$LIBS -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv -luser32" ]) +AS_CASE([$host_os], [openbsd*], [], [ + AC_CHECK_LIB([kvm], [kvm_open]) +]) AC_CHECK_HEADERS([sys/ahafs_evProds.h]) AC_CHECK_PROG(PKG_CONFIG, pkg-config, yes) AM_CONDITIONAL([HAVE_PKG_CONFIG], [test "x$PKG_CONFIG" != "x"]) diff --git a/src/unix/openbsd.c b/src/unix/openbsd.c index 7e4b253b..56f0af15 100644 --- a/src/unix/openbsd.c +++ b/src/unix/openbsd.c @@ -30,7 +30,6 @@ #include #include -#include #include #include #include