Page MenuHomeFreeBSD
Files F150779222

D23000.id66231.diff
No OneTemporary
Actions

D23000.id66231.diff
View Options

Index: stand/Makefile
===================================================================
--- stand/Makefile
+++ stand/Makefile
@@ -16,7 +16,7 @@
S.${MK_LOADER_LUA}+= liblua
S.${MK_LOADER_LUA}+= lua
S.${MK_FDT}+= fdt
-S.${MK_LOADER_OFW}+= ofw
+S.${MK_LOADER_OFW}+= libofw
S.yes+= defaults
S.yes+= man
Index: stand/defs.mk
===================================================================
--- stand/defs.mk
+++ stand/defs.mk
@@ -28,6 +28,7 @@
FICLSRC= ${BOOTSRC}/ficl
LDRSRC= ${BOOTSRC}/common
LIBLUASRC= ${BOOTSRC}/liblua
+LIBOFWSRC= ${BOOTSRC}/libofw
LUASRC= ${SRCTOP}/contrib/lua/src
SASRC= ${BOOTSRC}/libsa
SYSDIR= ${SRCTOP}/sys
Index: stand/ofw/Makefile
===================================================================
--- stand/ofw/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= libofw
-
-.include <bsd.subdir.mk>
Index: stand/powerpc/ofw/Makefile
===================================================================
--- stand/powerpc/ofw/Makefile
+++ stand/powerpc/ofw/Makefile
@@ -44,8 +44,8 @@
LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
# Open Firmware standalone support library
-LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a
-CFLAGS+= -I${BOOTSRC}/ofw/libofw
+LIBOFW= ${BOOTOBJ}/libofw/libofw.a
+CFLAGS+= -I${BOOTSRC}/libofw
DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
Index: stand/sparc64/loader/Makefile
===================================================================
--- stand/sparc64/loader/Makefile
+++ stand/sparc64/loader/Makefile
@@ -47,8 +47,8 @@
.endif
# Open Firmware standalone support library
-LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a
-CFLAGS+= -I${BOOTSRC}/ofw/libofw/
+LIBOFW= ${BOOTOBJ}/libofw/libofw.a
+CFLAGS+= -I${BOOTSRC}/libofw
DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSA}
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSA}

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 5, 12:16 AM (16 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30854877
Default Alt Text
D23000.id66231.diff (1 KB)

Event Timeline