From nobody Thu Nov 05 00:34:18 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 4jKjx714lmz6xjHf for ; Thu, 05 Nov 2026 00:34:19 +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 4jKjx70Cx4z4Cc9 for ; Thu, 05 Nov 2026 00:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793838859; 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=2Rqm23ivirYV1tErVS0TbqUf2mOIicjanNCsU/2xvPo=; b=yc8CrooVgr3DW9lipxs6BEEU3laZJ7cYl9rldaxXxX3M95zow2ED1k+H3egvyNqNzLCRQR 1L5Q+XfgE4Xmu5cxjebFZOyPk/AsP/Qxt6/8Wcb15VEFzhYjPO82hWogaJQ7ryhtY9EPgj XMViOVsWmYm16Gx3KYwS5eZR189s/oU69SS9cgc14F1qlhgXQQ1I6kvDpsuFAnbQYCA8FA 5uP6JEJj1/MfxelWF9MuNM1iLbUfe13b6MKqaclq3SgOSWrvz3a8vTkV4lpmSLD8aa0eYI hoWAJDbfVFiS2kVJ88dUjAYDySD6cit/dtmZdXNV8asj0Tp8Ik2OgCl+z/EgDQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793838859; b=efH9zuP9dBxZmJJFIyDydsrhoLrjvnbSg/tan/+KIHV5uefddpQRHlAit1IIm7tZszM788 660GjXwxqQl0BuFMuIOjPtWv3TAVtLE9ST5uVQOcfSDt3bV6COeZg3QSc6ePm98J8rBfVP IMdPsTCBVMsQUu5RRDAjfzMUAn++A8sBFiQYbZF+VCNeKbiF14JERK8V5ye6Urz9Zm71Kn p2k/v6jyj2FW1OhiPnH/n7SaPQd++O8H36QEzqkqJz8svzFFbOETWEwkIiSn9sKYdOTzOK 3wnae6035JmDE8mg6qdWhO7B/+VJMV9VNqtw+A1Xnqpi+OR996JOCLOQg/LQ5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793838859; 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=2Rqm23ivirYV1tErVS0TbqUf2mOIicjanNCsU/2xvPo=; b=IBNPsEHWw4kwu3vBKZBw5yRoyIJy/InW++ivYXzh0LUalushaFN7ZM2A9e7IJR7bWFphI4 kP5xe14FJeg5Q5MXQQBh7USR5OWQsxI8wtlT7qLOgaxZH8Z04Zd+AvEhg2QDPM56SB8BmX ehybaE4VFtvzwNsT0bGW25wNcywKLfe7Kwb21eVJhzq6PfDZpHtdY9Kpl950hL//ckN7bJ RJyYnpUlnUd4LN1mXTkzYwE9+Nx//3Mbdh3XM4vMRrwfbqnPftvq8xdjiPOi8biY4t8NI0 ifBdBSSHGJj4MH5b3QmYtNiYIAq0aTrR3uo0qkoui7TBs7E2o8Dg5Ln4qGC6TQ== 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 4jKjx66x3KzQLN for ; Thu, 05 Nov 2026 00:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c4ce by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 00:34:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: ded58efff1e2 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: ded58efff1e21e53a3ccae1a01373daa2c523618 Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 00:34:18 +0000 Message-Id: <6aebcf0a.3c4ce.c7b3186@gitrepo.freebsd.org> The branch stable/15 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ded58efff1e21e53a3ccae1a01373daa2c523618 commit ded58efff1e21e53a3ccae1a01373daa2c523618 Author: Jessica Clarke AuthorDate: 2026-10-29 12:29:54 +0000 Commit: Jessica Clarke CommitDate: 2026-11-05 00:33:26 +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 e2e0f3f75ab1..659be7d7e839 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2767,7 +2767,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 @@ -2967,6 +2967,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 #