Date: Sun, 3 Jan 2021 16:21:51 GMT From: Mariusz Zaborski <oshogbo@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 966026246e62 - main - bhyve: fix build without casper/capsicum support Message-ID: <202101031621.103GLpLM061551@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=966026246e62769f3bcd8247a47fe0f4f0433aba commit 966026246e62769f3bcd8247a47fe0f4f0433aba Author: Mariusz Zaborski <oshogbo@FreeBSD.org> AuthorDate: 2021-01-03 16:18:22 +0000 Commit: Mariusz Zaborski <oshogbo@FreeBSD.org> CommitDate: 2021-01-03 16:21:28 +0000 bhyve: fix build without casper/capsicum support PR: 252353 --- usr.sbin/bhyve/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index 0233690a5082..201f8c749f77 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -83,7 +83,16 @@ CFLAGS.kernemu_dev.c+= -I${SRCTOP}/sys/amd64 .PATH: ${BHYVE_SYSDIR}/sys/amd64/vmm SRCS+= vmm_instruction_emul.c -LIBADD= vmmapi md pthread z util sbuf cam 9p casper cap_pwd cap_grp +LIBADD= vmmapi md 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101031621.103GLpLM061551>