bhyve: Move libcasper dependecy to lib9p
libcasper(3) is not used in bhyve. So move dependency to the appropriate place. Reviewed by: markj MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D38905
This commit is contained in:
committed by
Mark Johnston
parent
42875200fa
commit
cff4823804
+3
-2
@@ -6,8 +6,11 @@
|
||||
CFLAGS+= -I${.CURDIR}
|
||||
CFLAGS+= -I${.CURDIR}/../../contrib/lib9p
|
||||
|
||||
LIBADD= sbuf
|
||||
|
||||
.if ${MK_CASPER} != "no"
|
||||
CFLAGS+= -DWITH_CASPER
|
||||
LIBADD+= casper cap_pwd cap_grp
|
||||
.endif
|
||||
|
||||
LIB= 9p
|
||||
@@ -28,6 +31,4 @@ SRCS= connection.c \
|
||||
INCSDIR= ${INCLUDEDIR}/lib9p
|
||||
INCS= fid.h lib9p.h backend/fs.h
|
||||
|
||||
LIBADD= sbuf
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
@@ -271,6 +271,10 @@ LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec.a
|
||||
# 2nd+ order consumers. Auto-generating this would be better.
|
||||
_DP_80211= sbuf bsdxml
|
||||
_DP_9p= sbuf
|
||||
.if ${MK_CASPER} != "no"
|
||||
_DP_9p+= casper cap_pwd cap_grp
|
||||
.endif
|
||||
|
||||
# XXX: Not bootstrapped so uses host version on non-FreeBSD, so don't use a
|
||||
# FreeBSD-specific dependency list
|
||||
.if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
|
||||
|
||||
@@ -89,14 +89,6 @@ SRCS+= vmm_instruction_emul.c
|
||||
|
||||
LIBADD= vmmapi md nv pthread z util sbuf cam 9p
|
||||
|
||||
.if ${MK_CASPER} != "no"
|
||||
LIBADD+= casper
|
||||
LIBADD+= cap_pwd
|
||||
LIBADD+= cap_grp
|
||||
# Temporary disable capsicum, until we integrate checkpoint code with it.
|
||||
#CFLAGS+=-DWITH_CASPER
|
||||
.endif
|
||||
|
||||
.if ${MK_BHYVE_SNAPSHOT} != "no"
|
||||
LIBADD+= ucl xo
|
||||
.endif
|
||||
|
||||
Reference in New Issue
Block a user