From nobody Sun Apr 23 01:01:46 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 4Q3qj65g8hz46ZYD; Sun, 23 Apr 2023 01:01:46 +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 4Q3qj65BDQz3jMy; Sun, 23 Apr 2023 01:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682211706; 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=lwVmd72cP0D4Dw/lJ5CUghu6ux2YES7+SwRQvOaVjbM=; b=iqAcpezt/2Azoc2U5P0PByLVzzUd7m3IMl+Jvv5MbfoqldFjtpHPof6K2+UFDwimT73IFB G1myN2Ui83sw1argEpZ1AGf5X/usxvlAEO/crz9QHl/XhT3OulNgs7gqTLXdE/V23AdW7+ ApYRnQgV3cWwL4zPcDOKVmkbKzalfShrv+6w+nrnzEZl0Pxs03q7jjNBED2wJHhbLQAHkK KblpYT1ib6ekhAxJK2XcqVoMRNLuPY2YlZp8PbqzVYF69PfVEIVivPcFfRe0r+5RsrxRkg kAg5fFVFHE+1wLDYU0y67DKR5/X8t31UVNbMxAjfBr/DVVnKF6V9zrqihbGqkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682211706; 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=lwVmd72cP0D4Dw/lJ5CUghu6ux2YES7+SwRQvOaVjbM=; b=HbSfNyYN968IAXjgYnNecjIH8whZrUKmJv5kl6xvFZlOmSDa9nnJhmjsP/UjSg34Uxnws9 Hs3rlwXPRuQKqUYdeYdEK5KiYVXfbQ4h3gJPkSK60cLiT96v45zUTMDNa1/DaKOoQln+bc CqeEPicSo3dVfRA45pXH/Gchg8QVOi43Lh7+6dT3YZs5iJ1EJiFgpo/uis3xBYlFcVIaC7 pEdV/uigq5hpaqeAE9ldqPjUXV+u/p8ALlFqevetX+kUgNvu3gPQLSw+7NQxteyNn4AIvB iEZbSKZWTnbkPB1PPZqtFwcH1d6V6QcLcltalUvuxBHjsuOI9qLojpKCCG5I+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682211706; a=rsa-sha256; cv=none; b=dJ73q7WGP69N6JhatLefh2TUNX2zFsvd2oNfNwykJjaOdda0TQV1UPQQks4czv96K7Jo29 Vjg8ZIxKQSSd9auN1JcxfOmcKuHytBKosZLi8n/+NfzDpRdCVePjAtURPe3yynurs89Eu/ +YdetQBogd6L6ARB3ct7VVhRoAzibTOU8qFRtra9rg5NCaHou9Zxwxqkg6hFLVhbr0pH9a td7tvSHzbn3LT05odoJyTc3EHXwr0tUfEA0xQWmg21F7EJtsMzG21xX6YHO1TDaAX7zdKy IAMeO5WlL++dOWNBPeff3SoTFHLR0JF9Dyrq1obr5WJYI9GW6p1WYWq03N1Gzw== 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 4Q3qj64GLtzNWv; Sun, 23 Apr 2023 01:01:46 +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 33N11kpd058699; Sun, 23 Apr 2023 01:01:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33N11kAB058696; Sun, 23 Apr 2023 01:01:46 GMT (envelope-from git) Date: Sun, 23 Apr 2023 01:01:46 GMT Message-Id: <202304230101.33N11kAB058696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: fb30bb0d4d0e - main - dirdeps.mk ensure M_dep_qual_fixes is applied 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb30bb0d4d0ed3beb27116761ac0c941607e3906 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=fb30bb0d4d0ed3beb27116761ac0c941607e3906 commit fb30bb0d4d0ed3beb27116761ac0c941607e3906 Author: Simon J. Gerraty AuthorDate: 2023-04-23 01:00:45 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-23 01:00:45 +0000 dirdeps.mk ensure M_dep_qual_fixes is applied --- share/mk/dirdeps.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/mk/dirdeps.mk b/share/mk/dirdeps.mk index 90ef5f55c790..6fedd00310e9 100644 --- a/share/mk/dirdeps.mk +++ b/share/mk/dirdeps.mk @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.156 2023/04/18 18:39:09 sjg Exp $ +# $Id: dirdeps.mk,v 1.157 2023/04/22 21:07:51 sjg Exp $ # SPDX-License-Identifier: BSD-2-Clause # @@ -645,9 +645,9 @@ _dm := ${DEP_MACHINE} # apply the same filtering that we do when qualifying DIRDEPS. # M_dep_qual_fixes expects .${MACHINE}* so add (and remove) '.' # Again we expect that any already qualified machines are fully qualified. -_machines := ${_machines:M*,*} ${_machines:N*,*:@DEP_MACHINE@${DEP_TARGET_SPEC}@:S,^,.,:${M_dep_qual_fixes:ts:}:O:u:S,^.,,} +_machines := ${_machines:M*,*} ${_machines:N*,*:@DEP_MACHINE@${DEP_TARGET_SPEC}@:S,^,.,:S,^.,,} DEP_MACHINE := ${_dm} -_machines := ${_machines:O:u} +_machines := ${_machines:${M_dep_qual_fixes:ts:}:O:u} .endif # reset each time through