*/*: Always use WRK_ENV with SETENVI

WRK_ENV contains environment variables like OSVERSION and UNAME_* that
are needed when cross-building packages using Poudriere for a different
version of FreeBSD or a different architecture than that of the host
system.
This commit is contained in:
Tijl Coosemans 2024-03-23 18:35:13 +01:00
parent 0dc10f1983
commit cc9c37d739
5 changed files with 5 additions and 5 deletions

View file

@ -36,7 +36,7 @@ post-patch:
@${LN} -s . ${WRKSRC}/lib/pci @${LN} -s . ${WRKSRC}/lib/pci
do-configure: do-configure:
@cd ${WRKSRC}/ && ${SETENVI} ${MAKE_ENV} ${MAKE_CMD} lib/config.h @cd ${WRKSRC}/ && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} lib/config.h
post-build: post-build:
@cd ${WRKSRC}/lib/ && ${CC} ${CFLAGS} ${STRIP} -Wl,-soname=libpci.so.3 -shared *.o -lz -o libpci.so.3 @cd ${WRKSRC}/lib/ && ${CC} ${CFLAGS} ${STRIP} -Wl,-soname=libpci.so.3 -shared *.o -lz -o libpci.so.3

View file

@ -30,7 +30,7 @@ do-configure:
@${ECHO_CMD} '${LDFLAGS}' > ${WRKSRC}/build/ldflags @${ECHO_CMD} '${LDFLAGS}' > ${WRKSRC}/build/ldflags
do-build: do-build:
@cd ${WRKSRC} && ${SETENVI} ${MAKE_ENV} ./package/make @cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ./package/make
do-install: do-install:
cd ${WRKSRC} && ./package/makeinstall cd ${WRKSRC} && ./package/makeinstall

View file

@ -23,7 +23,7 @@ GH_ACCOUNT= intel
USE_GITHUB= yes USE_GITHUB= yes
do-configure: do-configure:
@cd ${WRKSRC}/ && ${SETENVI} ${MAKE_ENV} ${MAKE_CMD} configure @cd ${WRKSRC}/ && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} configure
post-install: post-install:
${LN} -fs libtinycbor.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libtinycbor.so ${LN} -fs libtinycbor.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libtinycbor.so

View file

@ -70,6 +70,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/libcdi/src/cdi.inc ${STAGEDIR}${PREFIX}/include/cdi.inc ${INSTALL_DATA} ${WRKSRC}/libcdi/src/cdi.inc ${STAGEDIR}${PREFIX}/include/cdi.inc
test-NETCDF-on: test-NETCDF-on:
@cd ${WRKSRC}/ && ${SETENVI} CDO_PATH=src/cdo src/cdotest @cd ${WRKSRC}/ && ${SETENVI} ${WRK_ENV} CDO_PATH=src/cdo src/cdotest
.include <bsd.port.mk> .include <bsd.port.mk>

View file

@ -77,7 +77,7 @@ YAML_VARS= MANPAGES+="po2yaml yaml2po"
post-build: post-build:
@${MKDIR} ${WRKSRC}/manpages @${MKDIR} ${WRKSRC}/manpages
.for manpage in ${MANPAGES} .for manpage in ${MANPAGES}
cd ${WRKSRC}/build/lib/translate/convert && ${SETENVI} PYTHONPATH=${WRKSRC}/build/lib ${PYTHON_CMD} ${manpage}.py --man > ${WRKSRC}/manpages/${manpage}.1 cd ${WRKSRC}/build/lib/translate/convert && ${SETENVI} ${WRK_ENV} PYTHONPATH=${WRKSRC}/build/lib ${PYTHON_CMD} ${manpage}.py --man > ${WRKSRC}/manpages/${manpage}.1
.endfor .endfor
post-install: post-install: