cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The TESTS_ENVIRONMENT is used internally and not as the port

Browse Source 
infrastructure is trying to use it. So fix how the variables are passed
in for the regress tests.

from Brad
This commit is contained in:
ajacoutot 2012-02-22 07:43:58 +00:00
parent a7843c3581
commit 7279ef880c
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devel/automake/1.10/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2011/06/20 20:28:44 robert Exp $
# $OpenBSD: Makefile,v 1.12 2012/02/22 07:43:58 ajacoutot Exp $
COMMENT= GNU standards-compliant Makefile generator
@ -48,14 +48,13 @@ REGRESS_DEPENDS= ${BASE_PKGPATH} \
editors/emacs21 \
devel/dejagnu
TESTS_ENVIRONMENT= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
REGRESS_ENV= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
MAKE=${GMAKE}
do-regress:
ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
@cd ${WRKBUILD} && \
exec ${SETENV} ${MAKE_ENV} \
TESTS_ENVIRONMENT="${TESTS_ENVIRONMENT}" \
exec ${SETENV} ${MAKE_ENV} ${REGRESS_ENV} \
${MAKE_PROGRAM} ${ALL_REGRESS_FLAGS} \
-f ${MAKE_FILE} ${REGRESS_TARGET}

7
devel/automake/1.9/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2011/11/03 20:16:43 naddy Exp $
# $OpenBSD: Makefile,v 1.22 2012/02/22 07:43:58 ajacoutot Exp $
COMMENT= GNU standards-compliant Makefile generator
@ -48,7 +48,7 @@ REGRESS_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
print/texlive/base \
devel/dejagnu
TESTS_ENVIRONMENT= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
REGRESS_ENV= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
MAKE=${GMAKE}
post-patch:
@ -57,8 +57,7 @@ post-patch:
do-regress:
ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
@cd ${WRKBUILD} && \
exec ${SETENV} ${MAKE_ENV} \
TESTS_ENVIRONMENT='${TESTS_ENVIRONMENT}' \
exec ${SETENV} ${MAKE_ENV} ${REGRESS_ENV} \
${MAKE_PROGRAM} ${ALL_REGRESS_FLAGS} -f ${MAKE_FILE} \
${REGRESS_TARGET}