From owner-dev-commits-src-all@freebsd.org Sun Jan 3 16:21:51 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A6F244D614D; Sun, 3 Jan 2021 16:21:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D83tR3HXpz3MVM; Sun, 3 Jan 2021 16:21:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 63D78272E; Sun, 3 Jan 2021 16:21:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 103GLpVN061552; Sun, 3 Jan 2021 16:21:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 103GLpLM061551; Sun, 3 Jan 2021 16:21:51 GMT (envelope-from git) Date: Sun, 3 Jan 2021 16:21:51 GMT Message-Id: <202101031621.103GLpLM061551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: 966026246e62 - main - bhyve: fix build without casper/capsicum support MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 966026246e62769f3bcd8247a47fe0f4f0433aba Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2021 16:21:51 -0000 The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=966026246e62769f3bcd8247a47fe0f4f0433aba commit 966026246e62769f3bcd8247a47fe0f4f0433aba Author: Mariusz Zaborski AuthorDate: 2021-01-03 16:18:22 +0000 Commit: Mariusz Zaborski 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