Remove mkcsmapper_static and mkesdb_static from build-tools
Build them as part of the bootstrap-tools phase instead. Reviewed by: emaste (no objections) Differential Revision: https://reviews.freebsd.org/D28181
This commit is contained in:
Alex Richardson
parent
8185be3307
commit
2de949cf85
@ -2331,6 +2331,11 @@ _localedef= usr.bin/localedef
|
||||
${_bt}-usr.bin/localedef: ${_bt}-usr.bin/yacc ${_bt_lex_depend}
|
||||
.endif
|
||||
|
||||
.if ${MK_ICONV} != "no"
|
||||
_mkesdb= usr.bin/mkesdb
|
||||
_mkcsmapper= usr.bin/mkcsmapper
|
||||
.endif
|
||||
|
||||
.if ${MK_KERBEROS} != "no"
|
||||
_kerberos5_bootstrap_tools= \
|
||||
kerberos5/tools/make-roken \
|
||||
@ -2482,6 +2487,8 @@ bootstrap-tools: ${_bt}-links .PHONY
|
||||
${_nmtree} \
|
||||
${_vtfontcvt} \
|
||||
${_localedef} \
|
||||
${_mkcsmapper} \
|
||||
${_mkesdb} \
|
||||
${LOCAL_BSTOOL_DIRS}
|
||||
${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE
|
||||
${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \
|
||||
@ -2543,8 +2550,6 @@ _bt_clean= ${CLEANDIR}
|
||||
${_share} \
|
||||
usr.bin/awk \
|
||||
${_libmagic} \
|
||||
usr.bin/mkesdb_static \
|
||||
usr.bin/mkcsmapper_static \
|
||||
usr.bin/vi/catalog
|
||||
build-tools_${_tool}: .PHONY
|
||||
${_+_}@${ECHODIR} "===> ${_tool} (${_bt_clean:D${_bt_clean},}obj,build-tools)"; \
|
||||
|
||||
@ -3,7 +3,5 @@
|
||||
.include <bsd.own.mk>
|
||||
|
||||
CSMAPPERDIR?= /usr/share/i18n/csmapper
|
||||
.if ${MK_STAGING} == "yes"
|
||||
MKCSMAPPER= ${STAGE_HOST_OBJTOP}/usr/bin/mkcsmapper_static
|
||||
.endif
|
||||
MKCSMAPPER?= ${.OBJDIR:H:H:H}/usr.bin/mkcsmapper_static/mkcsmapper_static
|
||||
# mkcsmapper builds as part of bootstrap-tools and can therefore be found in $PATH
|
||||
MKCSMAPPER?= mkcsmapper
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
# $FreeBSD$
|
||||
# $NetBSD: Makefile,v 1.13 2007/03/13 16:34:37 tnozaki Exp $
|
||||
|
||||
MKCSMAPPER?= ${.OBJDIR:H:H:H:H}/usr.bin/mkcsmapper_static/mkcsmapper_static
|
||||
|
||||
ESUBDIR?= ${CODE}
|
||||
PARTFILE?= ${.CURDIR}/${CODE}.part
|
||||
.if exists(${PARTFILE})
|
||||
|
||||
@ -5,7 +5,5 @@
|
||||
.PATH: ${.CURDIR}
|
||||
|
||||
ESDBDIR?= /usr/share/i18n/esdb
|
||||
.if ${MK_STAGING} == "yes"
|
||||
MKESDB= ${STAGE_HOST_OBJTOP}/usr/bin/mkesdb_static
|
||||
.endif
|
||||
MKESDB?= ${.OBJDIR:H:H:H}/usr.bin/mkesdb_static/mkesdb_static
|
||||
# mkesdb builds as part of bootstrap-tools and can therefore be found in $PATH
|
||||
MKESDB?= mkesdb
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
# $FreeBSD$
|
||||
# $NetBSD: Makefile.part,v 1.6 2008/10/25 22:35:36 apb Exp $
|
||||
|
||||
MKESDB?= ${.OBJDIR:H:H:H:H}/usr.bin/mkesdb_static/mkesdb_static
|
||||
|
||||
PARTFILE?= ${.CURDIR}/${CODE}.part
|
||||
ALIASFILE?= ${.CURDIR}/${CODE}.alias
|
||||
.if !defined(NO_SEP)
|
||||
|
||||
@ -12,8 +12,8 @@ DIRDEPS = \
|
||||
usr.bin/clang/clang-tblgen \
|
||||
usr.bin/clang/llvm-tblgen \
|
||||
usr.bin/localedef \
|
||||
usr.bin/mkcsmapper_static \
|
||||
usr.bin/mkesdb_static \
|
||||
usr.bin/mkcsmapper \
|
||||
usr.bin/mkesdb \
|
||||
usr.bin/xinstall \
|
||||
usr.bin/yacc \
|
||||
usr.sbin/config \
|
||||
|
||||
@ -283,12 +283,6 @@ SUBDIR.${MK_UTMPX}+= users
|
||||
SUBDIR.${MK_UTMPX}+= who
|
||||
SUBDIR.${MK_OFED}+= ofed
|
||||
|
||||
# These are normally only handled for build-tools.
|
||||
.if make(clean*)
|
||||
SUBDIR+= mkcsmapper_static
|
||||
SUBDIR+= mkesdb_static
|
||||
.endif
|
||||
|
||||
.include <bsd.arch.inc.mk>
|
||||
|
||||
SUBDIR_PARALLEL=
|
||||
|
||||
@ -3,6 +3,12 @@
|
||||
.PATH: ${SRCTOP}/lib/libc/iconv
|
||||
|
||||
PROG= mkcsmapper
|
||||
.if defined(BOOTSTRAPPING)
|
||||
# When bootstrapping, the host libc might not contain these expected symbols
|
||||
# so compile them directly into the binary.
|
||||
SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \
|
||||
citrus_lookup_factory.c citrus_pivot_factory.c
|
||||
.endif
|
||||
LDFLAGS+= -L${SRCTOP}/lib/libc
|
||||
|
||||
NO_WMISSING_VARIABLE_DECLARATIONS=
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
include \
|
||||
include/arpa \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
usr.bin/yacc.host \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
@ -3,6 +3,12 @@
|
||||
.PATH: ${SRCTOP}/lib/libc/iconv
|
||||
|
||||
PROG= mkesdb
|
||||
.if defined(BOOTSTRAPPING)
|
||||
# When bootstrapping, the host libc might not contain these expected symbols
|
||||
# so compile them directly into the binary.
|
||||
SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \
|
||||
citrus_lookup_factory.c
|
||||
.endif
|
||||
|
||||
NO_WMISSING_VARIABLE_DECLARATIONS=
|
||||
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
include \
|
||||
include/arpa \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
usr.bin/yacc.host \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
Loading…
Reference in New Issue
Block a user