svn commit: r281338 - in head: lib/libvmmapi share/mk usr.sbin/bhyve usr.sbin/bhyveload
Baptiste Daroussin
bapt at FreeBSD.org
Thu Apr 9 21:38:43 UTC 2015
Author: bapt
Date: Thu Apr 9 21:38:40 2015
New Revision: 281338
URL: https://svnweb.freebsd.org/changeset/base/281338
Log:
Fix overlinking in bhyve:
libvmmapi is actually needed to be linked to libutil, not bhyve nor bhyveload
Modified:
head/lib/libvmmapi/Makefile
head/share/mk/src.libnames.mk
head/usr.sbin/bhyve/Makefile
head/usr.sbin/bhyveload/Makefile
Modified: head/lib/libvmmapi/Makefile
==============================================================================
--- head/lib/libvmmapi/Makefile Thu Apr 9 21:35:44 2015 (r281337)
+++ head/lib/libvmmapi/Makefile Thu Apr 9 21:38:40 2015 (r281338)
@@ -6,6 +6,8 @@ INCS= vmmapi.h
WARNS?= 2
+LIBADD= util
+
CFLAGS+= -I${.CURDIR}
.include <bsd.lib.mk>
Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk Thu Apr 9 21:35:44 2015 (r281337)
+++ head/share/mk/src.libnames.mk Thu Apr 9 21:38:40 2015 (r281338)
@@ -229,6 +229,7 @@ _DP_krb5+= asn1 com_err crypt crypto hx5
_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++
Modified: head/usr.sbin/bhyve/Makefile
==============================================================================
--- head/usr.sbin/bhyve/Makefile Thu Apr 9 21:35:44 2015 (r281337)
+++ head/usr.sbin/bhyve/Makefile Thu Apr 9 21:38:40 2015 (r281338)
@@ -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
Modified: head/usr.sbin/bhyveload/Makefile
==============================================================================
--- head/usr.sbin/bhyveload/Makefile Thu Apr 9 21:35:44 2015 (r281337)
+++ head/usr.sbin/bhyveload/Makefile Thu Apr 9 21:38:40 2015 (r281338)
@@ -4,7 +4,7 @@ PROG= bhyveload
SRCS= bhyveload.c
MAN= bhyveload.8
-LIBADD= vmmapi util
+LIBADD= vmmapi
WARNS?= 3
More information about the svn-src-head
mailing list