From nobody Tue Aug 20 02:48:58 2024 X-Original-To: dev-commits-ports-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 4Wnv6z1m1Cz5V4KG; Tue, 20 Aug 2024 02:48:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wnv6z0rgZz47H3; Tue, 20 Aug 2024 02:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724122139; 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=oimG26p9ifSCdCdD4hUA1Js3E3OeIY82xuN8BSsantQ=; b=wDh2869IZllg3xCRFVyyvW5dIeP85Ukvdf//l7/g3E9nX+Iu7ld/M7exKxXNKvDZTTCCWx fUaK9/5LLY3SOACYObQnmbbfXeh339ptoeASF9b75fQzOAjzE1hFIn3G6ethMx/GWmIYMj VKQ4rq05ecpJPJBnnL0v30U+fBR0EBBlDdaAQTr6LjQ8mrxc60QdodBwqOU4myPUpGAdk4 45uYAZXxQOr57jNxV4cb4aY7qt46lMnB/sjhorQ/XSXTtGqdA53glxsfHAlag77VusLryE j91e7Qg7MRl60UzdztMkIFMHWlsP4v+GecQaFV0+9+SO1UiZw3XyZDKLuBqBRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724122139; a=rsa-sha256; cv=none; b=xKKEPJXpdyc5QU7zzCZrGymZUFZtuRtZtNc/n2sh6C2rciihIPfW7Dg6YCIZcjeqBk2Clk oKFAlJOsWB/NfHpeyhuXNBgy/8OlS7L4WiCzIbiLuaoqujO9gaY01qK9KRPdqd5qlGlk7Z L0Dup2Ns6hNvWFkEaV+lZ4rUrelFW6wmfJ1Q+CJ1Wv+YiUoD/HRIqhoEminuzrJFZntZzW 2kW+oGiYLu/myNX/1rvInmY3LPwrqDvRGo3yWUA4qdgn4/6AyLHeha2Yg3Emd9juvTruRO za9MnFX2Cwv/qbl0lvXon48SRbExKXS5X5S9COQ+HUNcGrRhW55xyJZGEpGc4g== 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=1724122139; 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=oimG26p9ifSCdCdD4hUA1Js3E3OeIY82xuN8BSsantQ=; b=qm0bZzFc4C4Hkx7CVM6a7oNqpL3FM2ekxRZW8uCdwLTmO3n0K0A3k1eaBXjWZcnppqVUya hvQAFi29FO1l+TeIGLd39w04iCaBwNhUy6PxgFh+cWmzd1VO7iey7KLfrqtsfAy2yI9ANn AUaaOJjlJBeMknhBVe9OXW6Z6QgGe21v3VyUm+4S1YFo0sxT4cgmz6XMhm1aB6gcsiRU3F Yk2B33Jwl2sHyOgSC+Kb6bfFmZt2MJnXpxEw0O+R+mWQJv1DQv3h3T0v31L4iGFrZ7P2JT FJx5mtCE9j/GyHwrQa/ubBLfYcBzeh+C1dNEiR5WoxDbXslmx4jukRI+lPfDHg== 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 4Wnv6z0Nw9zjXY; Tue, 20 Aug 2024 02:48:59 +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 47K2mw1M033068; Tue, 20 Aug 2024 02:48:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47K2mwZt033065; Tue, 20 Aug 2024 02:48:58 GMT (envelope-from git) Date: Tue, 20 Aug 2024 02:48:58 GMT Message-Id: <202408200248.47K2mwZt033065@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 74eb1a46d69b - main - Mk/Uses: Validate arguments of USES=llvm:...; Improve format of error messages List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74eb1a46d69bac3c2ca2e5f51aa214a9375546a8 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=74eb1a46d69bac3c2ca2e5f51aa214a9375546a8 commit 74eb1a46d69bac3c2ca2e5f51aa214a9375546a8 Author: Yuri Victorovich AuthorDate: 2024-08-20 02:47:37 +0000 Commit: Yuri Victorovich CommitDate: 2024-08-20 02:47:37 +0000 Mk/Uses: Validate arguments of USES=llvm:...; Improve format of error messages --- Mk/Uses/llvm.mk | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/llvm.mk b/Mk/Uses/llvm.mk index 9b22482ea914..978784f11541 100644 --- a/Mk/Uses/llvm.mk +++ b/Mk/Uses/llvm.mk @@ -42,6 +42,16 @@ _LLVM_MK_VALID_CONSTRAINTS= min max _LLVM_MK_VALID_MODES= build run lib _LLVM_MK_VALID_EXPORTS= export noexport +# === verify that there are no invalid arguments === +. for _arg in ${llvm_ARGS} +. if !${_LLVM_MK_VALID_VERSIONS:M${_arg}} && \ + !${_LLVM_MK_VALID_MODES:M${_arg}} && \ + ${_arg:C/^(${_LLVM_MK_VALID_CONSTRAINTS:tW:S/ /|/g})=(${_LLVM_MK_VALID_VERSIONS:tW:S/ /|/g})$//} != "" && \ + !${_LLVM_MK_VALID_EXPORTS:M${_arg}} +BROKEN= USES=llvm:${llvm_ARGS:tW:S/ /,/g} contains an invalid argument: "${_arg}" +. endif +. endfor + # === parse mode arguments === _LLVM_MK_MODES= # empty . for _mode in ${_LLVM_MK_VALID_MODES} @@ -58,7 +68,7 @@ _LLVM_MK_VERSION= # empty . for _ver in ${_LLVM_MK_VALID_VERSIONS} . if ${llvm_ARGS:M${_ver}} . if !empty(_LLVM_MK_VERSION) -BROKEN= USES=llvm:${llvm_ARGS} contains multiple version definitions +BROKEN= USES=llvm:${llvm_ARGS:tW:S/ /,/g} contains multiple version definitions . else _LLVM_MK_VERSION= ${_ver} . endif @@ -77,7 +87,7 @@ _LLVM_MK_EXPORT= # empty . for _export in ${_LLVM_MK_VALID_EXPORTS} . if ${llvm_ARGS:M${_export}} . if !empty(_LLVM_MK_EXPORT) -BROKEN= USES=llvm:${llvm_ARGS} contains multiple export definitions +BROKEN= USES=llvm:${llvm_ARGS:tW:S/ /,/g} contains multiple export definitions . else _LLVM_MK_EXPORT= ${_export} . endif