From nobody Mon Oct 6 17:52:00 2025 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 4cgRfn3s3qz6BGGm; Mon, 06 Oct 2025 17:52:01 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgRfn0rfdz3xHZ; Mon, 06 Oct 2025 17:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759773121; 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=5nc0VZ/baKkwMmWZccthVFDlraEaaawdcD2rbABdttM=; b=P+oO8dHPtOhozCCmXn9HtgL/LqRhtp4IxhFgYLLXXdxP9yzOCGWOG78MDZKSmBkKOnrPyh +bh2B3XvGy0EVM7+eLHRcpsalISlRmhi41y7nvy1/YQu8m2oJ07ubqh7i8/69oUfoz5R97 lqSshZIl8bsJLQiG3lEcyf6HzMrgaoBrqfsyTnAIhZ+LQ40deWHMTnLGsfHBjNlBiP8AFE SleJqqr/wWqZvAH2QFPQgrjofUhAUZFnP4eBtbXuT+4LoKUGlOKih52RrKwy2p/tPmmZXt FXmP6DIlJWs4ynfMThAp80v8FSb5v+D8HrckdecqXUSdTm5Q5lVymtoo8HVDxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759773121; 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=5nc0VZ/baKkwMmWZccthVFDlraEaaawdcD2rbABdttM=; b=S71HmXP71FpE/ir6rwUjBS2F9mNpUL0XCwjCFazWOs5STX9rWCxDLlyxdOX/W53CVsjCnw 3rHHAeu9z+UEzZMx5QwWq4MQDo3HG/hjX2t+CnyU21jOqrgx65Cc/RI+KO9Qb2rCc47Vwi fJkl2nAQgGXai5X2anhWzHWHaOvCV1zu+tsFb7OF7ejZULE6H2zf2auq4MVaT54ghMOlEU bZ0UhzYqq09X+/1QA8yUMJc9iFUQWNbrofWecdgPKg1+nZjoj9AvkBaWGNY1WBOzKFZNUE KQHX/Gs58ceRzuLbDpRA1U3ys42NbR8FiCiedElP5r5SD29yRwdYSEQMIi4faw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759773121; a=rsa-sha256; cv=none; b=j2ylqDG2VnKA+PUnemd191XMmgwlC++BflBK5i74pZ+n54nCwZ0ChjO7kci4lEk5dKp6Vg udY+VB6drbjaIykp7TcNCyWeSdpLmUSGbkUsbZMxl55OVLsgnvAp4OhNRqyHidPhE5bezv f/+a2eb5NMrfq91yV57P8v16tPeWoQAwdUnMDgynePyxSbjrUJuYveJBN8IYpCea3VUIaX SPnenVSeOlJqCQ0hyYiwVms/o2kD8X4yt9yxnJRQJ1Gc6vaB6Yb4O9wrOK3bG4y3ROP/vR 3sXykqjDCrDlXjw75amqJkESsTMq/2DuzAb+mvtPD23IpnyCcJy8yfoZwLjwnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgRfn00gGz18Kd; Mon, 06 Oct 2025 17:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 596Hq0mP024991; Mon, 6 Oct 2025 17:52:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596Hq0dh024988; Mon, 6 Oct 2025 17:52:00 GMT (envelope-from git) Date: Mon, 6 Oct 2025 17:52:00 GMT Message-Id: <202510061752.596Hq0dh024988@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: ab492c08fc3c - main - build: don't create duplicate bootstrap-tools targets 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab492c08fc3cbf4fb5d569663c0751bc2a41cb1f Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ab492c08fc3cbf4fb5d569663c0751bc2a41cb1f commit ab492c08fc3cbf4fb5d569663c0751bc2a41cb1f Author: Kyle Evans AuthorDate: 2025-10-06 17:50:22 +0000 Commit: Kyle Evans CommitDate: 2025-10-06 17:51:29 +0000 build: don't create duplicate bootstrap-tools targets The general problem is that we might have a somewhat complicated dependency tree depending on bootstrap version requirements. We could document when multiple bootstrap tools might have a shared dependency and be careful to add them only once to the list, but that is a little more fragile- particularly if we purge some bootstrap tools and need to re-work the logic a little bit. Just avoid redefining the build commands as we're iterating over the list so that we can keep the actual requirements intact. PR: 289997 Reported by: dhw, others Reviewed by: imp Fixes: 151bd3516b5 ("flua: support our flua modules in [...]") Differential Revision: https://reviews.freebsd.org/D52904 --- Makefile.inc1 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 6ace6a6b5eaf..9dc4f2db4a6c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2842,6 +2842,15 @@ bootstrap-tools: ${_bt}-links .PHONY ${_mkesdb} \ ${_zic} \ ${LOCAL_BSTOOL_DIRS} +# We don't enforce any particular uniqueness of targets in the above list; it +# may be the case that different bootstrap tools may have shared dependencies +# at different BOOTSTRAPPING points, so we don't object to them using their own +# conditionals and duplicating them into their ${_foo} variable to ease future +# maintenance if we purge some entries. These target names are purposefully +# unique and this is the only place that should be generating commands for them, +# but the target may have been defined earlier to express dependencies -- thus, +# we specifically want commands() here. +.if !commands(${_bt}-${_tool}) ${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ @@ -2851,8 +2860,8 @@ ${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE fi; \ ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy install - bootstrap-tools: ${_bt}-${_tool} +.endif .endfor .if target(${_bt}-lib/libmd) # If we are bootstrapping libmd (e.g. when building on macOS/Linux) add the