Changeset View
Changeset View
Standalone View
Standalone View
usr.sbin/bhyve/Makefile
Show First 20 Lines • Show All 85 Lines • ▼ Show 20 Lines | |||||
SRCS+= vmm_instruction_emul.c | SRCS+= vmm_instruction_emul.c | ||||
LIBADD= vmmapi md nv pthread z util sbuf cam 9p | LIBADD= vmmapi md nv pthread z util sbuf cam 9p | ||||
.if ${MK_CASPER} != "no" | .if ${MK_CASPER} != "no" | ||||
LIBADD+= casper | LIBADD+= casper | ||||
LIBADD+= cap_pwd | LIBADD+= cap_pwd | ||||
LIBADD+= cap_grp | LIBADD+= cap_grp | ||||
LIBADD+= cap_sysctl | |||||
# Temporary disable capsicum, until we integrate checkpoint code with it. | # Temporary disable capsicum, until we integrate checkpoint code with it. | ||||
markj: The comment can be deleted. | |||||
#CFLAGS+=-DWITH_CASPER | CFLAGS+=-DWITH_CASPER | ||||
Not Done Inline Actions@oshogbo why is this commented out today? emaste: @oshogbo why is this commented out today? | |||||
Not Done Inline ActionsThe snapshot/checkpoint code depends on the open syscalls. oshogbo: The snapshot/checkpoint code depends on the open syscalls.
IRC John was working on improving… | |||||
Not Done Inline ActionsSorry I meant this commit: https://github.com/freebsd/freebsd-src/commit/483d953a86a2507355f8287c5107dc827a0ff516 oshogbo: Sorry I meant this commit: https://github.com/freebsd/freebsd… | |||||
Not Done Inline ActionsRight but I mean this one is not in a MK_BHYVE_SNAPSHOT block emaste: Right but I mean this one is not in a MK_BHYVE_SNAPSHOT block | |||||
Not Done Inline ActionsOh. I didn't notice the MK_BHYVE_SNAPSHOT block till you tell me. oshogbo: Oh. I didn't notice the MK_BHYVE_SNAPSHOT block till you tell me.
Yea it should be decided… | |||||
.endif | .endif | ||||
.if ${MK_BHYVE_SNAPSHOT} != "no" | .if ${MK_BHYVE_SNAPSHOT} != "no" | ||||
LIBADD+= ucl xo | LIBADD+= ucl xo | ||||
.endif | .endif | ||||
.if ${MK_INET_SUPPORT} != "no" | .if ${MK_INET_SUPPORT} != "no" | ||||
CFLAGS+=-DINET | CFLAGS+=-DINET | ||||
Show All 11 Lines | |||||
LIBADD+= crypto | LIBADD+= crypto | ||||
.endif | .endif | ||||
CFLAGS+= -I${BHYVE_SYSDIR}/sys/dev/e1000 | CFLAGS+= -I${BHYVE_SYSDIR}/sys/dev/e1000 | ||||
CFLAGS+= -I${BHYVE_SYSDIR}/sys/dev/mii | CFLAGS+= -I${BHYVE_SYSDIR}/sys/dev/mii | ||||
CFLAGS+= -I${BHYVE_SYSDIR}/sys/dev/usb/controller | CFLAGS+= -I${BHYVE_SYSDIR}/sys/dev/usb/controller | ||||
.if ${MK_BHYVE_SNAPSHOT} != "no" | .if ${MK_BHYVE_SNAPSHOT} != "no" | ||||
CFLAGS+= -I${SRCTOP}/contrib/libucl/include | CFLAGS+= -I${SRCTOP}/contrib/libucl/include | ||||
# Temporary disable capsicum, until we integrate checkpoint code with it. | |||||
CFLAGS+= -DWITHOUT_CAPSICUM | |||||
CFLAGS+= -DBHYVE_SNAPSHOT | CFLAGS+= -DBHYVE_SNAPSHOT | ||||
Not Done Inline ActionsWhen this works w/ Capsicum we should just remove the comment and CFLAGS emaste: When this works w/ Capsicum we should just remove the comment and CFLAGS | |||||
.endif | .endif | ||||
.ifdef GDB_LOG | .ifdef GDB_LOG | ||||
CFLAGS+=-DGDB_LOG | CFLAGS+=-DGDB_LOG | ||||
.endif | .endif | ||||
WARNS?= 2 | WARNS?= 2 | ||||
SUBDIR= kbdlayout | SUBDIR= kbdlayout | ||||
.include <bsd.prog.mk> | .include <bsd.prog.mk> |
The comment can be deleted.