local.dirdeps.mk skip N_host_libs for non-FreeBSD host
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:
parent
cb46f47c79
commit
e5e345a4b0
@ -4,7 +4,6 @@
|
|||||||
DIRDEPS = \
|
DIRDEPS = \
|
||||||
include \
|
include \
|
||||||
include/xlocale \
|
include/xlocale \
|
||||||
lib/libutil \
|
|
||||||
|
|
||||||
|
|
||||||
.include <dirdeps.mk>
|
.include <dirdeps.mk>
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
DIRDEPS_OPTIONS = host_egacy
|
DIRDEPS_OPTIONS = host_egacy
|
||||||
|
|
||||||
|
DIRDEPS.host_egacy.no = lib/libutil
|
||||||
DIRDEPS.host_egacy.yes = tools/build
|
DIRDEPS.host_egacy.yes = tools/build
|
||||||
|
|
||||||
.include <dirdeps-options.mk>
|
.include <dirdeps-options.mk>
|
||||||
|
@ -18,22 +18,8 @@ M_dep_qual_fixes += C;($m),[^/.,]*$$;\1;
|
|||||||
.endfor
|
.endfor
|
||||||
#.info M_dep_qual_fixes=${M_dep_qual_fixes}
|
#.info M_dep_qual_fixes=${M_dep_qual_fixes}
|
||||||
|
|
||||||
# Cheat for including src.libnames.mk
|
# Some things we never want to build for host
|
||||||
__<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}}
|
|
||||||
DIRDEPS_FILTER.host = \
|
DIRDEPS_FILTER.host = \
|
||||||
${N_host_libs} \
|
|
||||||
Ninclude* \
|
Ninclude* \
|
||||||
Nlib/csu* \
|
Nlib/csu* \
|
||||||
Nlib/libc \
|
Nlib/libc \
|
||||||
@ -42,6 +28,28 @@ DIRDEPS_FILTER.host = \
|
|||||||
Nsecure/lib* \
|
Nsecure/lib* \
|
||||||
Nusr.bin/xinstall* \
|
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+= \
|
DIRDEPS_FILTER+= \
|
||||||
Nbin/cat.host \
|
Nbin/cat.host \
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
DIRDEPS= \
|
DIRDEPS= \
|
||||||
|
sbin/md5 \
|
||||||
usr.bin/awk \
|
usr.bin/awk \
|
||||||
usr.bin/cap_mkdb \
|
usr.bin/cap_mkdb \
|
||||||
usr.bin/file2c \
|
usr.bin/file2c \
|
||||||
@ -12,6 +13,5 @@ DIRDEPS= \
|
|||||||
usr.sbin/makefs \
|
usr.sbin/makefs \
|
||||||
usr.sbin/nmtree \
|
usr.sbin/nmtree \
|
||||||
|
|
||||||
|
|
||||||
.include <dirdeps.mk>
|
.include <dirdeps.mk>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user