From nobody Wed Jan 25 17:03:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P29CX1LmPz3bvtd; Wed, 25 Jan 2023 17:03:36 +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 4P29CX0Vqnz3FJx; Wed, 25 Jan 2023 17:03:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674666216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I8+Si9gRCJsMmuJTYtV/xSAjygcXwAhA74IJljrZhxs=; b=UHPO7TUCtym5psbAf/E4oJ8+zC+IfRwBwPjkuAsHSYbSLC2DuM750O4OHZDR/PkWEVP7/a xGIgzsAMrWTLW9N/6nNn9z9aNSt4JcKPHfs07sQ/Vlss5OG720Vs5WI6xGH1NWJmX4n4OL Ef2i5lRCOatMWY0zyaBfiVxUdqGGM0xqW+Uxgmcu5gHNpbX19L1nMq3F6mQLTiEnVPTZGD SDKQ2jpsZmT5L+37T+xqN9eVSB+nDzFJnEhSybGrwPY2UeCt5pXAuD07LpEPccZzB1W/Lh /7ZCtWwq9eXXf+dISA59eF5eE4tiSKV4Cpo/CjyC/u0kwRLB1fHQgMzqbc4zqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674666216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I8+Si9gRCJsMmuJTYtV/xSAjygcXwAhA74IJljrZhxs=; b=OxdNhvNy75/Gc7knQPw+4jMFimj17ksZM7QxQvliydhc4QuX4tZEJUE+/l/aXgxgr0ndnD 3Uvf8rQwb8bkCHTsQz7+kxP0TksAShxGXTufgCj7fuJECZottZ4H55EruiPULwxNGj+BOT GJgS3Cas12c3J5upWDY1/ItBM9x0ANUvmR0RRxc6p0ZuYoyess3yCAaBXBuDBKv7xyL2XI E04gZbzM7Ix+ePL4S6tryQ0Wc2gjfP14vYpaTbvFC6b2aYWpzQBL5C2ZlNKY8I3zKvOACM 2Wf1W0W0l8JG7fvxDokW6FAZv1V3YZ/97a5eZmq0CyU7FSmOZFwM1tp+hArliw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674666216; a=rsa-sha256; cv=none; b=vsp2FnOeD9vrcUKatmCmSDow51Z0KNrF4Ms52JZBI68PHm0V+5rD9BhnfXnsYwruo49CH8 Bw1ZR3rSFqgW0sfk1FHYd3ZsGz/XleESG6HmJux0hqcIJMXLN+1POwLpBoVXkL4S06/W9A plxpRtgncS44SPFx2yi977EPO3W/j5WpOCkb0t8Jn+MeceiRbChWqWqbH2mUrj1x00J5AP nkinD4AwKf2lTTCEFHELwEjzteza6YC/194GjJL6LjsYTk52Po6NWVkybGQGmiOzhcpoX1 n28aDIFU7BVGlMwzbuPC3JiQLpmK+OmAZT6Z91dDcrvG0TXcvTpy3aMuEbIZbw== 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 4P29CW6PMGzxNt; Wed, 25 Jan 2023 17:03:35 +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 30PH3ZXd017902; Wed, 25 Jan 2023 17:03:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30PH3Z9H017901; Wed, 25 Jan 2023 17:03:35 GMT (envelope-from git) Date: Wed, 25 Jan 2023 17:03:35 GMT Message-Id: <202301251703.30PH3Z9H017901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 7a4a520064cb - main - Fix cross-build from STABLE or older CURRENT. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a4a520064cb7fbff79560113682d6fe1a1ae9ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7a4a520064cb7fbff79560113682d6fe1a1ae9ee commit 7a4a520064cb7fbff79560113682d6fe1a1ae9ee Author: Dag-Erling Smørgrav AuthorDate: 2023-01-25 17:03:10 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-01-25 17:03:10 +0000 Fix cross-build from STABLE or older CURRENT. 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: 783c318fd118 Sponsored by: Klara, Inc. Reviewed by: jrtc27, emaste Differential Revision: https://reviews.freebsd.org/D38195 --- Makefile.inc1 | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 1396a8e7a172..6435cadbd45c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1319,10 +1319,6 @@ __installcheck_sh_check: .PHONY # # Required install tools to be saved in a scratch dir for safety. # -.if ${MK_ZONEINFO} != "no" -_zoneinfo= zic tzsetup -.endif - .if !defined(CROSSBUILD_HOST) _sysctl=sysctl .endif @@ -1330,14 +1326,19 @@ _sysctl=sysctl ITOOLS= [ awk cap_mkdb cat chflags chmod chown cmp cp \ date echo egrep find grep id install ${_install-info} \ ln make mkdir mtree mv pwd_mkdb \ - rm sed services_mkdb sh sort strip ${_sysctl} test time true uname wc \ - ${_zoneinfo} ${LOCAL_ITOOLS} + rm sed services_mkdb sh sort strip ${_sysctl} test time true uname wc + +.if ${MK_ZONEINFO} != "no" +ITOOLS+=tzsetup +.endif # Needed for share/man .if ${MK_MAN_UTILS} != "no" ITOOLS+=makewhatis .endif +ITOOLS+=${LOCAL_ITOOLS} + # # distributeworld # @@ -2238,6 +2239,11 @@ _strfile= usr.bin/fortune/strfile # C source for loader built in font (8x16.c). _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 # 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. @@ -2440,10 +2446,6 @@ _basic_bootstrap_tools+=usr.bin/jot _basic_bootstrap_tools+=sbin/md5 .endif -.if ${MK_ZONEINFO} != "no" -_basic_bootstrap_tools+=usr.sbin/zic usr.sbin/tzsetup -.endif - .if defined(BOOTSTRAP_ALL_TOOLS) _other_bootstrap_tools+=${_basic_bootstrap_tools} .for _subdir _links in ${_basic_bootstrap_tools_multilink} @@ -2528,6 +2530,7 @@ bootstrap-tools: ${_bt}-links .PHONY ${_localedef} \ ${_mkcsmapper} \ ${_mkesdb} \ + ${_zic} \ ${LOCAL_BSTOOL_DIRS} ${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \