From nobody Thu Oct 29 12:30:57 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 4jFk9L3mT4z6wwvr for ; Thu, 29 Oct 2026 12:31:02 +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 4jFk9L39wBz4KYH for ; Thu, 29 Oct 2026 12:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793277062; 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=IGXRJmnv3/PlA9GM0yygyxZ4zdzACOxvyquGnsBuF9A=; b=d+ov1kljLXKcMBeyvCha7IAlM+4BjAqRe8zKgZfxPexNHvw9oBLV1Kxmq2sr1ZAw7gNq3C 19LxucyLaEHw+OnYXQwSEZ+yOtoI1XUDvjYmr/NZHxolfyvt/LViBhC8Oik5QDrdAaK+P7 nbWh4Sm9+SWb9dZBRs5yvJQcvlnMUTZYpzOJ+iYK6EM53lxBNnHt/3/I64o0ZlTqxZ5hxp 8ZxaCNFoqP5Rztqw8sn+xTYZyyg5xueCxiygGuFuRJHM/o9kIuukjHK/zGGbaAPW1DB11Q vQEm43sZc8Id2938WIruuR1pF/zZEczE6IWgEB0duqnKsTei2EZ3WnXpsJD7AQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793277062; b=sS0j0iWWyydLgM7WSe54SYJLecIzQhKtdQ3Xl22fEJGzJ9S81dBYsAs6IDELe0/Qtt5/6y ZQZXuMBPvkS+88VUmIJi4Knrl+S/7o504D4B8CBy4fa+aBVXwDgAbLgBw4+MzvOWjWJHdx Yj8t7Zdse0pHRws7f07xsmf8xkvTAYfi3qrsW9r1Y1+TOcUVSXpo9N6UKeZJeB/EYgSwBK zRCD7kArzc8GBvoCxnK4ENFHcgTmE24tB5diSsUkpW9wfWjuFV+VXGWfJzt916pymxw8Il b++wnHIuLMGX/G151qo9TnHbOAb4HpjJwcklkKRSgF4C/+YIZbdi+rq+epeDwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793277062; 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=IGXRJmnv3/PlA9GM0yygyxZ4zdzACOxvyquGnsBuF9A=; b=L0ZayHHMgGgFmqgdGkKRTHsN9SQTQcpR+r3LPxPR2GuqrwNyZAe5rg47dGCRpz3IDqgWV9 nSnRu+3c3rRZO4zg0eJqLJRnrNgKSQR4p9spHQ6iXCF0ZIiTLKXUo2VhOOQlJZyarBGcR6 W8LYrdrL5nu6pEmeQDoieTyQ1zflUULkPVqCRlMCGDai6doLK28f+Ogc62nvCwhWRBKXcD k73gdblQvgH4tHoLVWi0tp2+G/iUlUv0X+nR4U6kloDIhkmXepvOKPUV/MohyAydHMn7Z5 zGocMrxPwf1lazn6SBbmtV+K4fcYrl63qt8dSo90y4wE+Tv44i9+fPVZM7zwSg== 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 4jFk9L2rw2zgdC for ; Thu, 29 Oct 2026 12:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c31c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 12:30:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 983cb64c05fa - main - 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/main X-Git-Reftype: branch X-Git-Commit: 983cb64c05fabe2b83338d4c2087a9114ed27a1c Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 12:30:57 +0000 Message-Id: <6ae33c81.3c31c.66e5d55e@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=983cb64c05fabe2b83338d4c2087a9114ed27a1c commit 983cb64c05fabe2b83338d4c2087a9114ed27a1c Author: Jessica Clarke AuthorDate: 2026-10-29 12:29:54 +0000 Commit: Jessica Clarke CommitDate: 2026-10-29 12:29:54 +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 --- Makefile.inc1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 0ade6d0c7ccd..d0a6517baf83 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2779,7 +2779,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 @@ -2979,6 +2979,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 #