diff options
| author | Vitaliy Gusev <gusev.vitaliy@gmail.com> | 2023-03-07 16:09:22 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2023-03-07 16:09:22 +0000 |
| commit | cff4823804363cf199c7c87eed8870ad014066cc (patch) | |
| tree | 864c7baa38c92deeb67d1f3b17e77b3df8b717b6 | |
| parent | 42875200fa4405aa236880a9fbfea6c43eb7390d (diff) | |
| download | src-cff4823804363cf199c7c87eed8870ad014066cc.tar.gz src-cff4823804363cf199c7c87eed8870ad014066cc.zip | |
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
| -rw-r--r-- | lib/lib9p/Makefile | 5 | ||||
| -rw-r--r-- | share/mk/src.libnames.mk | 4 | ||||
| -rw-r--r-- | usr.sbin/bhyve/Makefile | 8 |
3 files changed, 7 insertions, 10 deletions
diff --git a/lib/lib9p/Makefile b/lib/lib9p/Makefile index c810ccd79e64..5d3681104d8c 100644 --- a/lib/lib9p/Makefile +++ b/lib/lib9p/Makefile @@ -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> diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index dd1bc78b1f1a..15971189306a 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.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) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index bf0a17edc59e..1c679a3c1578 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -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 |