From nobody Sun Oct 22 17:13:29 2023 X-Original-To: dev-commits-src-main@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 4SD4fK33w7z4xZMm; Sun, 22 Oct 2023 17:13:29 +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 4SD4fK2ZYpz4cZZ; Sun, 22 Oct 2023 17:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697994809; 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=hAj5bokSyyznfz+I+31ATS70q5XWa3HyLcoZBn21t5U=; b=hV6Ar1yRHhO7UsBd6z03QeiyrEYIaC1pYiT8cKidsmye/aU7/FuHIF3+pTAl1ufkGrj67C PMU9j/xspX3FlezYnIKWatrMeO5ZFhmeotQ8C9ZOOv9izbsyMfx4jVwu3Zci3tlKudWoL0 SdQbG6zlBxxOwVNfitfMPN6a/xokQF4al8A3eILMivLMZ6yHZi3lp9Q7YN7CSTwBoFnjQ+ 80oGiOMdsKlL6SLuQ/h0BzIuCsX1wA04Fowlf40aG4liDIV2fIMBBs0ZH9hpzyFBDJj5n6 7nVunLDDC80L6Nn0Bj2ji5K+LgLiH5zWw4Ow2ZVp12LClDCoGZqSTgMwq2yqTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697994809; a=rsa-sha256; cv=none; b=btptJt1gmGX1JtozASPR/10oblx7qQHf7ZmYh7XXFoEJM7OqmqTowP3cKuHb1aJ4yrEY+s woUT7jliUvRJaWLOnVYwy26EeBbk66zsqA7IUBZjoTv7Bcvz3Gux7sEb0Xn11S7NJMeiSX 58HNEwNcjHSdCNk/pJb5jWqJ0xseKy9bkQ0e92+2BZYaJG3QUCFQ+oX0yvdwy++Ke3/NWl LF33pLLU6mFfTuT3vEb9vV7bKmaXkSE8xaqItRo/hZrqunSyiA7w5aqcLFtCpYpKRse7Dp 0XzZH1G/LJYlN5r3RGXxXAa7rhojcZqzxgsJlfVxF+PdyOfV4STukjK3znLjqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697994809; 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=hAj5bokSyyznfz+I+31ATS70q5XWa3HyLcoZBn21t5U=; b=u03fANgY5wJnwTeay5dMIPGP6Ow27J5+GjDkbz2Ri8YPmw9dJ8MVxQzNhT63BpxqGPNOA4 vdH8JOMWuEavR1dFVhEs2eezq+iOj2mDMT4oXSGEee2cPJ/QiGh9p7M6aQuCdEo2/LWMtB G3MQwhUy+nIpdLGgYkhJwP1SelQDAQYBtI7TbpFWqs2av1JXIJemo3YSBaEnbAMoo3ZKZY oz3vK2XS+G7YJNCVU5k9z/THZxWlQ3UADAwq8/Sg54P/ylTsQT2UFNfnwqRYBBnFJ61UA+ eGpKM6GPT7s/WQNMFUhUNOXKOozc+Xe8mYgam6yQ6uvpQj94bpbAqXqyB1HrYg== 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 4SD4fK1fQhz15T7; Sun, 22 Oct 2023 17:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39MHDTvn050298; Sun, 22 Oct 2023 17:13:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MHDTa5050295; Sun, 22 Oct 2023 17:13:29 GMT (envelope-from git) Date: Sun, 22 Oct 2023 17:13:29 GMT Message-Id: <202310221713.39MHDTa5050295@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: ea9a7058f93f - main - bsd.man.mk guard against empty vars in MLINKS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: ea9a7058f93f1bd533efadb592843bbfa26293a1 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=ea9a7058f93f1bd533efadb592843bbfa26293a1 commit ea9a7058f93f1bd533efadb592843bbfa26293a1 Author: Simon J. Gerraty AuthorDate: 2023-10-22 17:13:20 +0000 Commit: Simon J. Gerraty CommitDate: 2023-10-22 17:13:20 +0000 bsd.man.mk guard against empty vars in MLINKS share/man/man4/Makefile adds a number of variables to MAN and MLINKS, which are only set for certain architectures. The empty variables wreak havoc when := is used. Add :M*.[1-9] to MLINKS reference for STAGE_LINKS.mlinks to avoid invalid results. Reviewed by: stevek --- share/mk/bsd.man.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 444144e6d626..25a0edcc7bc5 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -141,7 +141,7 @@ STAGE_DIR.man${_page:T:E}?= ${STAGE_OBJTOP}${MANDIR}${_page:T:E}${MANSUBDIR} .if !empty(MLINKS) STAGE_SETS+= mlinks STAGE_TARGETS+= stage_links -STAGE_LINKS.mlinks:= ${MLINKS:@f@${f:S,^,${MANDIR}${f:E}${MANSUBDIR}/,}@} +STAGE_LINKS.mlinks:= ${MLINKS:M*.[1-9]:@f@${f:S,^,${MANDIR}${f:E}${MANSUBDIR}/,}@} stage_links.mlinks: ${_mansets:@s@stage_files.$s@} .endif .endif