git: b247ff70e8f1 - main - stand: Rename LIBFDT to LIBSAFDT

The branch main has been updated by markj:

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

commit b247ff70e8f1b4bf184b9fc85d2908ec4db2d1ab
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-11-07 14:57:32 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-11-07 14:57:32 +0000

    stand: Rename LIBFDT to LIBSAFDT
    
    Preemptively address a collision with LIBFDT (to be added in the future)
    from src.libnames.mk, which gets included via bsd.progs.mk.  No
    functional change intended.
    
    Reviewed by:    imp
    MFC after:      1 week
    Sponsored by:   Innovate UK
    Differential Revision:  https://reviews.freebsd.org/D42486
---
 stand/efi/loader/Makefile  | 4 ++--
 stand/fdt.mk               | 2 +-
 stand/kboot/Makefile       | 4 ++--
 stand/powerpc/ofw/Makefile | 4 ++--
 stand/uboot/Makefile       | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile
index 3ce9ac169bd1..5a755c1d329f 100644
--- a/stand/efi/loader/Makefile
+++ b/stand/efi/loader/Makefile
@@ -122,7 +122,7 @@ ${LOADER}.efi: ${PROG}
 
 LIBEFI=		${BOOTOBJ}/efi/libefi/libefi.a
 
-DPADD=		${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} ${LDSCRIPT}
-LDADD=		${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA}
+DPADD=		${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA} ${LDSCRIPT}
+LDADD=		${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA}
 
 .include <bsd.prog.mk>
diff --git a/stand/fdt.mk b/stand/fdt.mk
index 56c9ff95b5ad..1b3df587d0db 100644
--- a/stand/fdt.mk
+++ b/stand/fdt.mk
@@ -4,5 +4,5 @@ CFLAGS+=	-I${FDTSRC}
 CFLAGS+=	-I${BOOTOBJ}/fdt
 CFLAGS+=	-I${SYSDIR}/contrib/libfdt
 CFLAGS+=	-DLOADER_FDT_SUPPORT
-LIBFDT=		${BOOTOBJ}/fdt/libfdt.a
+LIBSAFDT=	${BOOTOBJ}/fdt/libfdt.a
 .endif
diff --git a/stand/kboot/Makefile b/stand/kboot/Makefile
index f5049a1c19c0..b9d68cddf97d 100644
--- a/stand/kboot/Makefile
+++ b/stand/kboot/Makefile
@@ -63,7 +63,7 @@ CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
 
 CFLAGS+=	-Wall
 
-DPADD=		${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
-LDADD=		${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
+DPADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
+LDADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
 
 .include <bsd.prog.mk>
diff --git a/stand/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile
index 2beb315a4d41..3e4c92220fac 100644
--- a/stand/powerpc/ofw/Makefile
+++ b/stand/powerpc/ofw/Makefile
@@ -59,8 +59,8 @@ LDFLAGS+=	-T ${.CURDIR}/ldscript.powerpc
 LIBOFW=		${BOOTOBJ}/libofw/libofw.a
 CFLAGS+=	-I${BOOTSRC}/libofw
 
-DPADD=		${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
-LDADD=		${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
+DPADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
+LDADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
 
 MK_PIE=		no
 
diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile
index 1cc4abe86d9b..83ac5949cbb3 100644
--- a/stand/uboot/Makefile
+++ b/stand/uboot/Makefile
@@ -78,7 +78,7 @@ OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
 ubldr ubldr.bin ubldr.pie: ${OBJS}
 .endif
 
-DPADD=		${LDR_INTERP} ${LIBFDT} ${LIBSA}
-LDADD=		${LDR_INTERP} ${LIBFDT} ${LIBSA}
+DPADD=		${LDR_INTERP} ${LIBSAFDT} ${LIBSA}
+LDADD=		${LDR_INTERP} ${LIBSAFDT} ${LIBSA}
 
 .include <bsd.prog.mk>