d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Makefile.depend.host for bootstrap-tools so it automatically builds

Browse Source 
for host
This commit is contained in:
Simon J. Gerraty 2014-05-16 17:50:23 +00:00
parent 0a117278be
commit 8a9439c5ed
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/projects/bmake/; revision=266264
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/Makefile
View File

@ -60,8 +60,9 @@ SHIPDIR = no
.else
all_machine_list = ${ALL_MACHINE_LIST} host common
.if defined(ALL_MACHINES)
DIRDEPS := ${DIRDEPS:O:u:@d@${ALL_MACHINE_LIST:O:u:@m@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE:T:R}.$m):?$d.$m:}@}@}
DIRDEPS := ${DIRDEPS:O:u:@d@${all_machine_list:O:u:@m@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE_PREFIX:T}.$m):?$d.$m:}@}@}
.undef ALL_MACHINES
PKG_MACHINE_LIST ?= ${DIRDEPS:E:O:u}
.elif defined(HOST_MACHINE) && ${MACHINE} == ${HOST_MACHINE}
@ -69,10 +70,9 @@ PKG_MACHINE_LIST ?= ${DIRDEPS:E:O:u}
# some packages only support one machine which may not be ${MACHINE}
# some support multiple, in which case unless ALL_MACHINES is defined
# we only want ${MACHINE}
plain := ${DIRDEPS:@d@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE:T:R}):?$d:}@}
plain := ${DIRDEPS:@d@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE_PREFIX:T}):?$d:}@}
.if ${plain} != ${DIRDEPS}
all_machine_list = ${ALL_MACHINE_LIST} host
qual := ${DIRDEPS:${plain:${M_ListToSkip}}:@d@${all_machine_list:O:u:@m@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE:T:R}.$m):?$d.$m:}@}@}
qual := ${DIRDEPS:${plain:${M_ListToSkip}}:@d@${all_machine_list:O:u:@m@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE_PREFIX:T}.$m):?$d.$m:}@}@}
DIRDEPS := ${plain} ${qual}
PKG_MACHINE_LIST ?= ${MACHINE} ${qual:E:O:u}
.endif
@ -88,6 +88,24 @@ PKG_MACHINE_LIST := ${PKG_MACHINE_LIST}
.endif
.endif
# we don't use DIRDEPS_FILTER, since we only want it to
# apply to this initial list
.if !empty(REQUESTED_MACHINE) && !empty(DIRDEPS)
# this is a variant of the logic above, we want plain
# but need to filter the qualified DIRDEPS to REQUESTED_MACHINE
plain := ${DIRDEPS:@d@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE_PREFIX:T}):?$d:}@}
.if ${plain} != ${DIRDEPS}
qual := ${DIRDEPS:${plain:${M_ListToSkip}}:M*.${REQUESTED_MACHINE}}
.if empty(qual)
qual := ${DIRDEPS:@d@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE:T}):?$d.${.MAKE.DEPENDFILE:E}:}@}
.endif
DIRDEPS := ${plain} ${qual}
.endif
.if empty(DIRDEPS)
.error ${REQUESTED_MACHINE} is not appropriate for ${DEP_RELDIR:T}
.endif
.endif
.if !empty(build_options)
build_options := ${build_options:O:u}
.for v in ${build_options}

0
pkgs/pseudo/bootstrap-tools/Makefile.depend → pkgs/pseudo/bootstrap-tools/Makefile.depend.host
View File