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

Fix cross-build from STABLE or older CURRENT.

Browse Source 
Previously, zic and tzsetup were both listed as install tools and basic
bootstrap tools.  Actually, tzsetup is an install tool while zic is a
non-basic bootstrap tool.

Fixes:		783c318fd1
Sponsored by:	Klara, Inc.
Reviewed by:	jrtc27, emaste
Differential Revision:	https://reviews.freebsd.org/D38195
This commit is contained in:
Dag-Erling Smørgrav 2023-01-25 18:03:10 +01:00
parent f1021d27f7
commit 7a4a520064
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile.inc1
View File

@ -1319,10 +1319,6 @@ __installcheck_sh_check: .PHONY
# #
# Required install tools to be saved in a scratch dir for safety. # Required install tools to be saved in a scratch dir for safety.
# #
.if ${MK_ZONEINFO} != "no"
_zoneinfo= zic tzsetup
.endif
.if !defined(CROSSBUILD_HOST) .if !defined(CROSSBUILD_HOST)
_sysctl=sysctl _sysctl=sysctl
.endif .endif
@ -1330,14 +1326,19 @@ _sysctl=sysctl
ITOOLS= [ awk cap_mkdb cat chflags chmod chown cmp cp \ ITOOLS= [ awk cap_mkdb cat chflags chmod chown cmp cp \
date echo egrep find grep id install ${_install-info} \ date echo egrep find grep id install ${_install-info} \
ln make mkdir mtree mv pwd_mkdb \ ln make mkdir mtree mv pwd_mkdb \
rm sed services_mkdb sh sort strip ${_sysctl} test time true uname wc \ rm sed services_mkdb sh sort strip ${_sysctl} test time true uname wc
${_zoneinfo} ${LOCAL_ITOOLS}
.if ${MK_ZONEINFO} != "no"
ITOOLS+=tzsetup
.endif
# Needed for share/man # Needed for share/man
.if ${MK_MAN_UTILS} != "no" .if ${MK_MAN_UTILS} != "no"
ITOOLS+=makewhatis ITOOLS+=makewhatis
.endif .endif
ITOOLS+=${LOCAL_ITOOLS}
# #
# distributeworld # distributeworld
# #
@ -2238,6 +2239,11 @@ _strfile= usr.bin/fortune/strfile
# C source for loader built in font (8x16.c). # C source for loader built in font (8x16.c).
_vtfontcvt= usr.bin/vtfontcvt _vtfontcvt= usr.bin/vtfontcvt
# zic is used to compile timezone data
.if ${MK_ZONEINFO} != "no"
_zic= usr.sbin/zic
.endif
# If we are not building the bootstrap because BOOTSTRAPPING is sufficient # If we are not building the bootstrap because BOOTSTRAPPING is sufficient
# we symlink the host version to $WORLDTMP instead. By doing this we can also # we symlink the host version to $WORLDTMP instead. By doing this we can also
# detect when a bootstrap tool is being used without the required MK_FOO. # detect when a bootstrap tool is being used without the required MK_FOO.
@ -2440,10 +2446,6 @@ _basic_bootstrap_tools+=usr.bin/jot
_basic_bootstrap_tools+=sbin/md5 _basic_bootstrap_tools+=sbin/md5
.endif .endif
.if ${MK_ZONEINFO} != "no"
_basic_bootstrap_tools+=usr.sbin/zic usr.sbin/tzsetup
.endif
.if defined(BOOTSTRAP_ALL_TOOLS) .if defined(BOOTSTRAP_ALL_TOOLS)
_other_bootstrap_tools+=${_basic_bootstrap_tools} _other_bootstrap_tools+=${_basic_bootstrap_tools}
.for _subdir _links in ${_basic_bootstrap_tools_multilink} .for _subdir _links in ${_basic_bootstrap_tools_multilink}
@ -2528,6 +2530,7 @@ bootstrap-tools: ${_bt}-links .PHONY
${_localedef} \ ${_localedef} \
${_mkcsmapper} \ ${_mkcsmapper} \
${_mkesdb} \ ${_mkesdb} \
${_zic} \
${LOCAL_BSTOOL_DIRS} ${LOCAL_BSTOOL_DIRS}
${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE ${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE
${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \