Page MenuHomeFreeBSD
Files F106189945

D42486.diff
No OneTemporary
Actions

D42486.diff
View Options

diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile
--- a/stand/efi/loader/Makefile
+++ b/stand/efi/loader/Makefile
@@ -122,7 +122,7 @@
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
--- a/stand/fdt.mk
+++ b/stand/fdt.mk
@@ -4,5 +4,5 @@
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
--- a/stand/kboot/Makefile
+++ b/stand/kboot/Makefile
@@ -63,7 +63,7 @@
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
--- a/stand/powerpc/ofw/Makefile
+++ b/stand/powerpc/ofw/Makefile
@@ -59,8 +59,8 @@
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
--- a/stand/uboot/Makefile
+++ b/stand/uboot/Makefile
@@ -78,7 +78,7 @@
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>

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 27, 9:18 PM (8 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15617727
Default Alt Text
D42486.diff (1 KB)

Event Timeline