git: d878f72a73e1 - main - bhyve: Provide optional libfdt linking

From: Mark Johnston <markj_at_FreeBSD.org>
Date: Wed, 10 Apr 2024 15:18:59 UTC
The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=d878f72a73e104b705d7ee07a3152ad841eadf05

commit d878f72a73e104b705d7ee07a3152ad841eadf05
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-04-03 16:48:45 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-04-10 15:17:55 +0000

    bhyve: Provide optional libfdt linking
    
    The arm64 port currently does not support ACPI, it instead builds up an
    FDT which is exported to the guest.  This mechanism will not be used on
    amd64 but isn't really arm64-specific either, so provide an opt-in
    mechanism to link libfdt.
    
    No functional change intended.
    
    Reviewed by:    corvink, jhb
    MFC after:      2 weeks
    Sponsored by:   Innovate UK
    Differential Revision:  https://reviews.freebsd.org/D40995
---
 usr.sbin/bhyve/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
index 03ea77769754..efa5b4acf897 100644
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -70,6 +70,11 @@ SRCS+=	snapshot.c
 
 .include "${MACHINE_CPUARCH}/Makefile.inc"
 
+.if defined(BHYVE_FDT_SUPPORT)
+LIBADD+= fdt
+CFLAGS+= -I${SRCTOP}/sys/contrib/libfdt
+.endif
+
 .if defined(BHYVE_GDB_SUPPORT)
 SRCS+=	gdb.c
 CFLAGS+= -DBHYVE_GDB
@@ -83,7 +88,7 @@ CFLAGS+=-I${.CURDIR}		\
 	-I${.CURDIR}/../../contrib/lib9p \
 	-I${SRCTOP}/sys
 
-LIBADD=	vmmapi md nv pthread z util sbuf cam 9p
+LIBADD+= vmmapi md nv pthread z util sbuf cam 9p
 
 .if ${MK_BHYVE_SNAPSHOT} != "no"
 LIBADD+= ucl xo