Page MenuHomeFreeBSD
Files F102953096

D23411.diff
No OneTemporary
Actions

D23411.diff
View Options

diff --git a/stand/Makefile b/stand/Makefile
--- a/stand/Makefile
+++ b/stand/Makefile
@@ -11,22 +11,44 @@
S.yes+= libsa
+S.${MK_LOADER_OFW}+= libofw
+S.${MK_FDT}+= fdt
+
S.${MK_FORTH}+= ficl
S.${MK_FORTH}+= forth
S.${MK_LOADER_LUA}+= liblua
S.${MK_LOADER_LUA}+= lua
-S.${MK_FDT}+= fdt
-S.${MK_LOADER_OFW}+= libofw
S.yes+= defaults
S.yes+= man
+.if ${MK_FORTH} != "no"
+INTERP_DEPENDS+= forth
+.endif
+.if ${MK_LOADER_LUA} != "no"
+INTERP_DEPENDS+= lua
+.endif
+
.include <bsd.arch.inc.mk>
S.${MK_EFI}+= efi
S.${MK_LOADER_UBOOT}+= uboot
+.if defined(LIB32LIST)
+LIB32DEPENDS= ${LIB32LIST:S/$/32/}
+.endif
+
.if exists(${.CURDIR}/${MACHINE}/.)
S.yes+= ${MACHINE}
+SUBDIR_DEPEND_${MACHINE}+= ${INTERP_DEPENDS}
+.if ${MK_FDT} != "no"
+SUBDIR_DEPEND_${MACHINE}+= fdt
+.endif
+.if ${MK_LOADER_UBOOT} != "no"
+SUBDIR_DEPEND_${MACHINE}+= uboot
+.endif
+.if ${MK_LOADER_OFW} != "no"
+SUBDIR_DEPEND_${MACHINE}+= libofw
+.endif
.endif
# Build the actual subdir list from S.yes, adding in the 32-bit
@@ -36,6 +58,20 @@
.if defined(LIB32LIST) && ${LIB32LIST:M${_x}}
SUBDIR+=${_x}32
.endif
+.if ${_x} != "libsa"
+SUBDIR_DEPEND_${_x}+= libsa
+SUBDIR_DEPEND_${_x}32+= libsa32
+.endif
.endfor
+# Remaining dependencies
+SUBDIR_DEPEND_libsa32+= libsa
+
+SUBDIR_DEPEND_forth+= ficl
+SUBDIR_DEPEND_lua+= liblua
+
+SUBDIR_DEPEND_efi+= fdt
+
+SUBDIR_PARALLEL= yes
+
.include <bsd.subdir.mk>
diff --git a/stand/Makefile.amd64 b/stand/Makefile.amd64
--- a/stand/Makefile.amd64
+++ b/stand/Makefile.amd64
@@ -2,3 +2,7 @@
S.yes+= userboot
S.yes+= i386
+
+SUBDIR_DEPEND_userboot+= ${INTERP_DEPENDS}
+# These won't get tacked on in an amd64 build
+SUBDIR_DEPEND_i386+= ${LIB32DEPENDS} ${INTERP_DEPENDS}
diff --git a/stand/Makefile.inc b/stand/Makefile.inc
--- a/stand/Makefile.inc
+++ b/stand/Makefile.inc
@@ -1,3 +1,5 @@
# $FreeBSD$
+SUBDIR_PARALLEL= yes
+
.include "defs.mk"
diff --git a/stand/efi/Makefile b/stand/efi/Makefile
--- a/stand/efi/Makefile
+++ b/stand/efi/Makefile
@@ -4,8 +4,12 @@
.include <bsd.init.mk>
+SUBDIR.yes+= libefi
SUBDIR.${MK_FDT}+= fdt
-SUBDIR.yes+= libefi boot1 gptboot
+SUBDIR.yes+= .WAIT
+
+SUBDIR.yes+= boot1 gptboot
+
SUBDIR.${MK_FORTH}+= loader_4th
SUBDIR.${MK_LOADER_LUA}+= loader_lua
SUBDIR.yes+= loader_simp
diff --git a/stand/i386/Makefile b/stand/i386/Makefile
--- a/stand/i386/Makefile
+++ b/stand/i386/Makefile
@@ -4,10 +4,15 @@
.include <bsd.init.mk>
-SUBDIR.yes= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
- isoboot libi386
-
+# Almost everything else here relies on btxldr, so we must make sure it's built
+# before everything else proceeds so we don't end up building against a stale
+# btxldr and ending up with a build-during-install scenario.
+SUBDIR.yes+= btx libi386
SUBDIR.${MK_LOADER_FIREWIRE}+= libfirewire
+SUBDIR.yes+= .WAIT
+
+SUBDIR.yes+= mbr pmbr boot0 boot0sio boot2 cdboot gptboot \
+ isoboot
SUBDIR.${MK_FORTH}+= loader_4th
SUBDIR.${MK_LOADER_LUA}+= loader_lua
@@ -18,4 +23,6 @@
SUBDIR.${MK_LOADER_ZFS}+= zfsboot gptzfsboot
+SUBDIR_DEPEND_pxeldr+= loader_${LOADER_DEFAULT_INTERP}
+
.include <bsd.subdir.mk>

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 20, 3:38 AM (21 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14729554
Default Alt Text
D23411.diff (3 KB)

Event Timeline