Framework: Use WRK_ENV when handling USE_LOCALE

PR: 276478
freebsd · Mar 28, 2024 · bf8e12d · bf8e12d
1 parent aa4ef7e
commit bf8e12d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
@@ -2012,8 +2012,7 @@ ERROR+=	"Unknown USES=${f:C/\:.*//}"
 .    endif
 
 .    if defined(USE_LOCALE)
-CONFIGURE_ENV+=	LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
-MAKE_ENV+=		LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
+WRK_ENV+=	LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
 .    endif
 
 # Macro for doing in-place file editing using regexps.  REINPLACE_ARGS may only

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
@@ -135,7 +135,7 @@ CONFIGURE_ARGS+=	--with-system-libffi --with-ffi-includes=${LOCALBASE}/include -
 CONFIGURE_ENV+=		CC=${CC} CXX=${CXX}
 SHEBANG_FILES+=		hadrian/bootstrap/bootstrap.py
 HADRIAN_CMD=		${WRKSRC}/hadrian/bootstrap/_build/bin/hadrian ${HADRIAN_DOCS_ARG} ${HADRIAN_GMP_ARG}
-DO_MAKE_BUILD=		${SETENV} ${MAKE_ENV} ${HADRIAN_CMD} ${_MAKE_JOBS} --flavour=ports
+DO_MAKE_BUILD=		${SETENVI} ${WRK_ENV} ${HADRIAN_CMD} ${_MAKE_JOBS} --flavour=ports
 ALL_TARGET=		binary-dist-dir
 INSTALL_WRKSRC=		${WRKSRC}/_build/bindist/ghc-${GHC_VERSION}-${CONFIGURE_TARGET}
 INSTALL_TARGET=		install

diff --git a/math/scilab-toolbox-swt/Makefile b/math/scilab-toolbox-swt/Makefile
@@ -18,7 +18,7 @@ USE_LOCALE=	en_US.UTF-8
 
 SCILAB_CMD=	${LOCALBASE}/bin/scilab-adv-cli
 SCILAB_ARGS=	-noatomsautoload -nb -nouserstartup
-MAKE_ENV=	SCI_JAVA_ENABLE_HEADLESS=1 SCI_DISABLE_TK=1
+WRK_ENV=	SCI_JAVA_ENABLE_HEADLESS=1 SCI_DISABLE_TK=1
 DOS2UNIX_FILES=	etc/swt.start
 
 CONTRIBDIR?=	share/scilab/contrib
@@ -57,7 +57,7 @@ pre-build:
 
 do-build:
 	cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${SCILAB_CMD} ${SCILAB_ARGS} -f builder.sce
+		${SETENVI} ${WRK_ENV} ${SCILAB_CMD} ${SCILAB_ARGS} -f builder.sce
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${TOOLBOXDIR} "-name *\.so -or -name loader*\.sce"