Date: Thu, 28 Mar 2024 11:42:14 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: bf8e12d3e728 - main - Framework: Use WRK_ENV when handling USE_LOCALE Message-ID: <202403281142.42SBgEAw072651@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf8e12d3e72868d97f4515c7dee6a22dd0f30e74 commit bf8e12d3e72868d97f4515c7dee6a22dd0f30e74 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2024-03-28 06:21:00 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2024-03-28 11:40:52 +0000 Framework: Use WRK_ENV when handling USE_LOCALE PR: 276478 --- Mk/bsd.port.mk | 3 +-- lang/ghc/Makefile | 2 +- math/scilab-toolbox-swt/Makefile | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 3e6dd7ec1daa..e120b2cd1632 100644 --- 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 index 5e6fda6901af..3d64f3d7b49b 100644 --- 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 index daffac10f7ca..4607c3fc1695 100644 --- 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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403281142.42SBgEAw072651>