git: b8bbb207f55d - main - devel/xtensa-esp-elf: Use SETENVI and WRK_ENV to fix build with poudriere-devel

The branch main has been updated by leres:

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

commit b8bbb207f55db647f7a6aeb2c97a04010bc3d5fd
Author:     Craig Leres <leres@FreeBSD.org>
AuthorDate: 2025-03-28 17:28:09 +0000
Commit:     Craig Leres <leres@FreeBSD.org>
CommitDate: 2025-03-28 17:28:09 +0000

    devel/xtensa-esp-elf: Use SETENVI and WRK_ENV to fix build with poudriere-devel
    
    PR:             285720
    Reported by:    arrowd
---
 devel/xtensa-esp-elf/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/devel/xtensa-esp-elf/Makefile b/devel/xtensa-esp-elf/Makefile
index 6cd9a7a7c546..be53e3ada521 100644
--- a/devel/xtensa-esp-elf/Makefile
+++ b/devel/xtensa-esp-elf/Makefile
@@ -55,7 +55,8 @@ GH_TAGNAME=	esp-2.41.0_${ESPDATE}:github1 \
 		esp-4.3.0_${ESPDATE}:github3 \
 		${TAG_WRAPPERS}:github4
 BINARY_ALIAS=	g++=${CXX} gcc=${CC} python=${PYTHON_VERSION}
-BUILD_ENV=	CT_ALLOW_BUILD_AS_ROOT_SURE=1 \
+BUILD_ENV=	${WRK_ENV} \
+		CT_ALLOW_BUILD_AS_ROOT_SURE=1 \
 		CT_FORBID_DOWNLOAD=y \
 		GREP=${LOCALBASE}/bin/grep \
 		LD_RUN_PATH=${PREFIX}/lib/${CC} \
@@ -117,12 +118,12 @@ post-extract:
 do-configure:
 	cd ${BUILD_WRKSRC} && ./bootstrap
 	cd ${BUILD_WRKSRC} && \
-	    ${SETENV} ${BUILD_ENV} LIBS=-lintl \
+	    ${SETENVI} ${BUILD_ENV} LIBS=-lintl \
 	    ./configure --prefix=${WRKDIR}/ct-ng --exec-prefix=${WRKDIR}/ct-ng
 	cd ${BUILD_WRKSRC} && \
-	    ${SETENV} -uMAKELEVEL -uMAKEFLAGS -u.MAKE.LEVEL.ENV ${BUILD_ENV} \
+	    ${SETENVI} -uMAKELEVEL -uMAKEFLAGS -u.MAKE.LEVEL.ENV ${BUILD_ENV} \
 	    ${MAKE_CMD} install && \
-	    ${SETENV} ${BUILD_ENV} ./ct-ng xtensa-esp-elf
+	    ${SETENVI} ${BUILD_ENV} ./ct-ng xtensa-esp-elf
 
 	# xtensa-toolchian-wrapper
 	${MKDIR} ${WRKDIR}/.cargo
@@ -139,7 +140,7 @@ do-configure:
 	    ${CARGO_UPDATE_ARGS}
 
 do-build:
-	cd ${BUILD_WRKSRC} && ${SETENV} ${BUILD_ENV} ./ct-ng build
+	cd ${BUILD_WRKSRC} && ${SETENVI} ${BUILD_ENV} ./ct-ng build
 	cd ${BUILD_WRKSRC}/builds/${PORTNAME} && \
 	    ${CHMOD} +w . lib && \
 	    ${RM} build.log.bz2 lib/charset.alias && \