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

local.dirdeps.mk skip N_host_libs for non-FreeBSD host

Browse Source 
The N_host_libs dance only makes sense if host is FreeBSD.
Even then, if MK_host_egacy is yes we need libmd

libnetbsd does not need libutil when using libegacy

Sponsored by:	Juniper Networks, Inc.
This commit is contained in:
Simon J. Gerraty 2023-05-04 11:58:39 -07:00
parent cb46f47c79
commit e5e345a4b0
4 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libnetbsd/Makefile.depend
View File

@ -4,7 +4,6 @@
DIRDEPS = \
include \
include/xlocale \
lib/libutil \
.include <dirdeps.mk>

1
lib/libnetbsd/Makefile.depend.options
View File

@ -1,5 +1,6 @@
DIRDEPS_OPTIONS = host_egacy
DIRDEPS.host_egacy.no = lib/libutil
DIRDEPS.host_egacy.yes = tools/build
.include <dirdeps-options.mk>

38
share/mk/local.dirdeps.mk
View File

@ -18,22 +18,8 @@ M_dep_qual_fixes += C;($m),[^/.,]*$$;\1;
.endfor
#.info M_dep_qual_fixes=${M_dep_qual_fixes}
# Cheat for including src.libnames.mk
__<bsd.init.mk>__:
# Pull in _INTERNALLIBS
.include <src.libnames.mk>
# Host libraries should mostly be excluded from the build so the
# host version in /usr/lib is used. Internal libraries need to be
# allowed to be built though since they are never installed.
_need_host_libs=
.for lib in ${_INTERNALLIBS}
_need_host_libs+= ${LIB${lib:tu}DIR:S,^${OBJTOP}/,,}
.endfor
N_host_libs:= ${cd ${SRCTOP} && echo lib/lib*:L:sh:${_need_host_libs:${M_ListToSkip}}:${M_ListToSkip}}
# Some things we never want to build for host
DIRDEPS_FILTER.host = \
${N_host_libs} \
Ninclude* \
Nlib/csu* \
Nlib/libc \
@ -42,6 +28,28 @@ DIRDEPS_FILTER.host = \
Nsecure/lib* \
Nusr.bin/xinstall* \
.if ${.MAKE.OS} == "FreeBSD"
# Host libraries should mostly be excluded from the build so the
# host version in /usr/lib is used.
# Internal libraries need to be allowed to be built though
# since they are never installed.
# Cheat for including src.libnames.mk
__<bsd.init.mk>__:
# Pull in _INTERNALLIBS
.include <src.libnames.mk>
_need_host_libs=
.for lib in ${_INTERNALLIBS}
_need_host_libs+= ${LIB${lib:tu}DIR:S,^${OBJTOP}/,,}
.endfor
.if ${MK_host_egacy} == "yes"
_need_host_libs+= lib/libmd
.endif
N_host_libs:= ${cd ${SRCTOP} && echo lib/lib*:L:sh:${_need_host_libs:${M_ListToSkip}}:${M_ListToSkip}}
DIRDEPS_FILTER.host+= ${N_host_libs}
.endif
DIRDEPS_FILTER+= \
Nbin/cat.host \

2
targets/pseudo/host-tools/Makefile.depend.host
View File

@ -1,4 +1,5 @@
DIRDEPS= \
sbin/md5 \
usr.bin/awk \
usr.bin/cap_mkdb \
usr.bin/file2c \
@ -12,6 +13,5 @@ DIRDEPS= \
usr.sbin/makefs \
usr.sbin/nmtree \
.include <dirdeps.mk>