From owner-dev-commits-src-main@freebsd.org Mon Aug 2 13:35:13 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2FE8C6747F3; Mon, 2 Aug 2021 13:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GdfBm6CtYz4RXF; Mon, 2 Aug 2021 13:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B157120629; Mon, 2 Aug 2021 13:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 172DZC3w050699; Mon, 2 Aug 2021 13:35:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 172DZCeH050698; Mon, 2 Aug 2021 13:35:12 GMT (envelope-from git) Date: Mon, 2 Aug 2021 13:35:12 GMT Message-Id: <202108021335.172DZCeH050698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 2de949cf85d0 - main - Remove mkcsmapper_static and mkesdb_static from build-tools MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2de949cf85d0e0b9ff71e1ffd74153814de96175 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Aug 2021 13:35:13 -0000 The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=2de949cf85d0e0b9ff71e1ffd74153814de96175 commit 2de949cf85d0e0b9ff71e1ffd74153814de96175 Author: Alex Richardson AuthorDate: 2021-08-02 09:49:01 +0000 Commit: Alex Richardson CommitDate: 2021-08-02 13:33:25 +0000 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 --- Makefile.inc1 | 9 +++++++-- share/i18n/csmapper/Makefile.inc | 6 ++---- share/i18n/csmapper/Makefile.part | 2 -- share/i18n/esdb/Makefile.inc | 6 ++---- share/i18n/esdb/Makefile.part | 2 -- targets/pseudo/hosttools/Makefile.depend.host | 4 ++-- usr.bin/Makefile | 6 ------ usr.bin/mkcsmapper/Makefile | 6 ++++++ usr.bin/mkcsmapper_static/Makefile.depend | 19 ------------------- usr.bin/mkesdb/Makefile | 6 ++++++ usr.bin/mkesdb_static/Makefile.depend | 19 ------------------- 11 files changed, 25 insertions(+), 60 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 8fa55f5cea2e..e3707c7a504a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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)"; \ diff --git a/share/i18n/csmapper/Makefile.inc b/share/i18n/csmapper/Makefile.inc index 284900c1bc05..72473764f313 100644 --- a/share/i18n/csmapper/Makefile.inc +++ b/share/i18n/csmapper/Makefile.inc @@ -3,7 +3,5 @@ .include 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 diff --git a/share/i18n/csmapper/Makefile.part b/share/i18n/csmapper/Makefile.part index 4dbb4ff313dd..6b472f815bc6 100644 --- a/share/i18n/csmapper/Makefile.part +++ b/share/i18n/csmapper/Makefile.part @@ -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}) diff --git a/share/i18n/esdb/Makefile.inc b/share/i18n/esdb/Makefile.inc index ab61d2cee22f..096beeb96a62 100644 --- a/share/i18n/esdb/Makefile.inc +++ b/share/i18n/esdb/Makefile.inc @@ -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 diff --git a/share/i18n/esdb/Makefile.part b/share/i18n/esdb/Makefile.part index 703854e6e527..0378b117a5ca 100644 --- a/share/i18n/esdb/Makefile.part +++ b/share/i18n/esdb/Makefile.part @@ -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) diff --git a/targets/pseudo/hosttools/Makefile.depend.host b/targets/pseudo/hosttools/Makefile.depend.host index 1def9574156b..3d6ab127eec9 100644 --- a/targets/pseudo/hosttools/Makefile.depend.host +++ b/targets/pseudo/hosttools/Makefile.depend.host @@ -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 \ diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 206da7154ac2..f1b07a7007be 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -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 SUBDIR_PARALLEL= diff --git a/usr.bin/mkcsmapper/Makefile b/usr.bin/mkcsmapper/Makefile index 5d5e8b560bbf..eda8f96bf153 100644 --- a/usr.bin/mkcsmapper/Makefile +++ b/usr.bin/mkcsmapper/Makefile @@ -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= diff --git a/usr.bin/mkcsmapper_static/Makefile.depend b/usr.bin/mkcsmapper_static/Makefile.depend deleted file mode 100644 index f2071f254a6b..000000000000 --- a/usr.bin/mkcsmapper_static/Makefile.depend +++ /dev/null @@ -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 - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/usr.bin/mkesdb/Makefile b/usr.bin/mkesdb/Makefile index d49ecfa88f63..3540dcc8401a 100644 --- a/usr.bin/mkesdb/Makefile +++ b/usr.bin/mkesdb/Makefile @@ -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= diff --git a/usr.bin/mkesdb_static/Makefile.depend b/usr.bin/mkesdb_static/Makefile.depend deleted file mode 100644 index f2071f254a6b..000000000000 --- a/usr.bin/mkesdb_static/Makefile.depend +++ /dev/null @@ -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 - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif