Fix overlinking in bhyve:

libvmmapi is actually needed to be linked to libutil, not bhyve nor bhyveload
2015-04-09 21:38:40 +00:00 · 2015-04-09 21:38:40 +00:00 · ea4a4d8a2e
commit ea4a4d8a2e
parent 0f55f9d67b
4 changed files with 5 additions and 2 deletions
--- a/lib/libvmmapi/Makefile
+++ b/lib/libvmmapi/Makefile
@ -6,6 +6,8 @@ INCS=	vmmapi.h

 WARNS?=	2

+LIBADD=	util
+
 CFLAGS+= -I${.CURDIR}

 .include <bsd.lib.mk>
--- 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++
--- 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

--- 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