From ea4a4d8a2e1342723c704972808b553021852a71 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Thu, 9 Apr 2015 21:38:40 +0000 Subject: [PATCH] Fix overlinking in bhyve: libvmmapi is actually needed to be linked to libutil, not bhyve nor bhyveload --- lib/libvmmapi/Makefile | 2 ++ share/mk/src.libnames.mk | 1 + usr.sbin/bhyve/Makefile | 2 +- usr.sbin/bhyveload/Makefile | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/libvmmapi/Makefile b/lib/libvmmapi/Makefile index 93d3c85d156..26cf86fbe4c 100644 --- a/lib/libvmmapi/Makefile +++ b/lib/libvmmapi/Makefile @@ -6,6 +6,8 @@ INCS= vmmapi.h WARNS?= 2 +LIBADD= util + CFLAGS+= -I${.CURDIR} .include diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index d6a9ba29ac4..0fbad38e879 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -229,6 +229,7 @@ _DP_krb5+= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc \ _DP_gssapi_krb5+= gssapi krb5 crypto roken asn1 com_err _DP_lzma= pthread _DP_ucl= m +_DP_vmmapi= util # Define spacial cases LDADD_supcplusplus= -lsupc++ diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index 5a1c2c6cecc..bb81bcbaa7f 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -43,7 +43,7 @@ SRCS= \ .PATH: ${.CURDIR}/../../sys/amd64/vmm SRCS+= vmm_instruction_emul.c -LIBADD= vmmapi md util pthread +LIBADD= vmmapi md pthread WARNS?= 2 diff --git a/usr.sbin/bhyveload/Makefile b/usr.sbin/bhyveload/Makefile index aa89b6c16d9..fce0c1b663e 100644 --- a/usr.sbin/bhyveload/Makefile +++ b/usr.sbin/bhyveload/Makefile @@ -4,7 +4,7 @@ PROG= bhyveload SRCS= bhyveload.c MAN= bhyveload.8 -LIBADD= vmmapi util +LIBADD= vmmapi WARNS?= 3