git: c98bdc21c65e - main - Mk/Uses/nodejs.mk: Fix nodejs_ARGS check

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Sun, 09 Apr 2023 13:44:29 UTC

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c98bdc21c65e97a62c9290d38e002ec99d8905bc

commit c98bdc21c65e97a62c9290d38e002ec99d8905bc
Author:     John Hein <jcfyecrayz@liamekaens.com>
AuthorDate: 2023-04-09 13:35:48 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-04-09 13:37:36 +0000

    Mk/Uses/nodejs.mk: Fix nodejs_ARGS check
    
    - Fix empty() usage
    - Add missing valid USES=nodejs:env
    
    PR:             270706
---
 Mk/Uses/nodejs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk
index 751d95dfe443..9c43cf3bc1e4 100644
--- a/Mk/Uses/nodejs.mk
+++ b/Mk/Uses/nodejs.mk
@@ -28,7 +28,7 @@ _VALID_NODEJS_VERSIONS=	14 16 18 19 current lts
 IGNORE=	Invalid default nodejs version ${NODEJS_DEFAULT}; valid versions are ${_VALID_NODEJS_VERSIONS}
 .  endif
 
-.  if !empty(${nodejs_ARGS:Nbuild:Nrun:Nlts:Ncurrent:N14:N16:N18:N19})
+.  if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N14:N16:N18:N19)
 IGNORE=		USES=nodejs has invalid arguments ${nodejs_ARGS}.
 .  endif