From nobody Thu Nov 05 00:35:30 2026 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 4jKjyW1HjDz6xjXN for ; Thu, 05 Nov 2026 00:35:31 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jKjyV6vv6z4DcB for ; Thu, 05 Nov 2026 00:35:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793838931; 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=1O5CT4Lz0iiKo3FpcJKlOOSIWOGs9SdxtVc4Opt/3t0=; b=LpzQrI8pWkzuFo2uionzusEur23gvCnus1lRm8Ai6X3bAvfQcDBAQHb+Ow0mH8MhWxQk6y R4e5pEoQR7XLZfhgCnEh4DoKOCW2tzBTAhT1w1pa8WRXSYOZXa7vhlexm+3FDk87+eiSpf JLUUJrczlf3CYk2BrLyuVxNnzWzrwyOpOck5evZk9S/tJFVSG/ixvSjr0NFTuhJsx7Db3C pw+cckVi2W16KF4YrxlwDuf83kr0JD//uJzb8CnFC27XiCJ8bg6+oapDzkp2BClQnIGQVj j9X6flA+1JvDGFVYTSR41g9IunsEzkOYPyKvVwbnPqwm2/jlqPUi0Zr9PpGDgw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793838931; b=sku75cmgZMEAG/5zwWwSRAtBkec2eZDUv/pLRvyHl0kUar0/WOtn+godhZClz6jlqxYez9 p0oA64qgoL9CPw4rhC8IqVgpaUqdc/of8du8NDMIfTMhk3FN1il6tg9ICzb3iJ8lS4aBWb 9kTCMWuTiDfllFwaTMwezvxp+zfNOEu/G5Nuwels3MTwibBqw05UAKTBqDgtTSc/Ez1IQi UZaIIx2VaEKyhG1qzeW5t/ACMknOUGO+6BaU7y1mHxyyBimUPGR053q1FyxX1YCVR2Hrmh GK84jhnHT4uKB3dl440Xj0cM2D2WJVlh6KvB3cqNwYJezWmOLESDa4VMEM9XSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793838931; 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=1O5CT4Lz0iiKo3FpcJKlOOSIWOGs9SdxtVc4Opt/3t0=; b=YkULdEh8vIIUqHkHtSiNpRnm3Q4WEA6GC+NEDxtqrixpkSQKFsnF+3DAfTxs2/2cLARM8P y/TdVR1trb2UXbcKxmf+aoWSQRmM8LCcTgJxOJbrnePvGoU4GAdF/GJpDPh5UoOAgQEnsJ 4TYMB9hZmXDFw6c8buLDx2Hedf7aItvqSUlDIHv40mFZgnkQgvHvRESXlUMkdtciyuGdDa 9r0YzO//5CEq1uz1cwWvYfhYAZqwNl0hXHjN7U6rsJdOXNN89A5GGqSSRzutki+J7Ki1T0 fAgo4sVVlFomAlZ5DbTfLO5giY0TKPUA1gbNyPBaM1VmH9EhyVFr4nm7f8szkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jKjyV6Z8HzR49 for ; Thu, 05 Nov 2026 00:35:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c4d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 00:35:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 8f83a7a336b4 - stable/14 - Makefile.inc1: Make bootstrap mandoc's bootstrap libz dependency conditional List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f83a7a336b42cc42063da8115713398e8da6a0f Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 00:35:30 +0000 Message-Id: <6aebcf52.3c4d2.25879ac@gitrepo.freebsd.org> The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=8f83a7a336b42cc42063da8115713398e8da6a0f commit 8f83a7a336b42cc42063da8115713398e8da6a0f Author: Jessica Clarke AuthorDate: 2026-10-29 12:29:54 +0000 Commit: Jessica Clarke CommitDate: 2026-11-05 00:35:04 +0000 Makefile.inc1: Make bootstrap mandoc's bootstrap libz dependency conditional We bootstrap libz unconditionally on macOS and Linux, and conditionally on FreeBSD if pre-1600029 or DISK_IMAGE_TOOLS_BOOTSTRAP is enabled, but if building on new enough -CURRENT without DISK_IMAGE_TOOLS_BOOTSTRAP then libz is not bootstrapped and so this libz dependency does not exist. Add the dependency whenever we are bootstrapping libz but not otherwise, and do so without duplicating the condition. Fixes: 1dbcc7ee92c4 ("Makefile.inc1: Make sure mandoc bootstrap tool depends on libz") MFC after: 1 week (cherry picked from commit 983cb64c05fabe2b83338d4c2087a9114ed27a1c) --- Makefile.inc1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index acebaa680a72..9ae19b7fbc8e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2603,7 +2603,7 @@ ${_bt}-${_tool}: ${_bt}-usr.bin/yacc ${_bt_lex_depend} .endfor .endif -${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd ${_bt}-lib/libz +${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd # The tools listed in _basic_bootstrap_tools will generally not be # bootstrapped unless BOOTSTRAP_ALL_TOOL is set. However, when building on a @@ -2775,6 +2775,11 @@ ${_bt}-usr.bin/sort: ${_bt}-lib/libmd ${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd ${_bt}-sbin/md5: ${_bt}-lib/libmd .endif +.if target(${_bt}-lib/libz) +# If we are bootstrapping libz (e.g. when building on macOS/Linux) add the +# necessary dependency: +${_bt}-usr.bin/mandoc: ${_bt}-lib/libz +.endif #