jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-26 20:12:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

stand: Rename LIBFDT to LIBSAFDT

Browse Source 
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
This commit is contained in:
Mark Johnston 2023-11-07 09:57:32 -05:00
parent b8dbfb0a6c
commit b247ff70e8
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stand/efi/loader/Makefile
View File

@ -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>

2
stand/fdt.mk
View File

@ -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

4
stand/kboot/Makefile
View File

@ -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>

4
stand/powerpc/ofw/Makefile
View File

@ -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

4
stand/uboot/Makefile
View File

@ -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>