1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-06 11:41:52 +00:00

Fix build when bash is installed, by changing the (incorrect) usage

of SCRIPTS_ENV to CONFIGURE_ENV.

This works around the problem and makes this port build now, but there
is almost certainly something very strange going on with any one of the
recent updates to ports/shells/bash and it's handling of arguments passed
to configure scripts, since this most definitely used to work.

Detective work by:	Ion-Mihai Tetcu <itetcu@people.tecnik93.com>
Approved by:		portmgr (implicit)
This commit is contained in:
Ade Lovett 2006-02-28 05:56:43 +00:00
parent 9f8d03ad8c
commit d8d9101c6c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=156875
4 changed files with 24 additions and 20 deletions

View File

@ -143,16 +143,17 @@ pre-configure:
.endfor
run-autotools::
cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf
cd ${WRKDIR}/apr-${PORTVERSION} ; \
${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
${RM} -fr xml/expat
${RM} -fr xml/expat
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf \
${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf \
--with-apr=../apr-${PORTVERSION}
cd ${WRKDIR}/apr-${PORTVERSION}; \
${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
cd ${WRKDIR}/apr-util-${PORTVERSION}; \
${SETENV} ${SCRIPTS_ENV} ${SH} \
${SETENV} ${CONFIGURE_ENV} ${SH} \
./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}
do-configure:

View File

@ -143,16 +143,17 @@ pre-configure:
.endfor
run-autotools::
cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf
cd ${WRKDIR}/apr-${PORTVERSION} ; \
${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
${RM} -fr xml/expat
${RM} -fr xml/expat
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf \
${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf \
--with-apr=../apr-${PORTVERSION}
cd ${WRKDIR}/apr-${PORTVERSION}; \
${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
cd ${WRKDIR}/apr-util-${PORTVERSION}; \
${SETENV} ${SCRIPTS_ENV} ${SH} \
${SETENV} ${CONFIGURE_ENV} ${SH} \
./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}
do-configure:

View File

@ -143,16 +143,17 @@ pre-configure:
.endfor
run-autotools::
cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf
cd ${WRKDIR}/apr-${PORTVERSION} ; \
${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
${RM} -fr xml/expat
${RM} -fr xml/expat
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf \
${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf \
--with-apr=../apr-${PORTVERSION}
cd ${WRKDIR}/apr-${PORTVERSION}; \
${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
cd ${WRKDIR}/apr-util-${PORTVERSION}; \
${SETENV} ${SCRIPTS_ENV} ${SH} \
${SETENV} ${CONFIGURE_ENV} ${SH} \
./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}
do-configure:

View File

@ -143,16 +143,17 @@ pre-configure:
.endfor
run-autotools::
cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf
cd ${WRKDIR}/apr-${PORTVERSION} ; \
${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
${RM} -fr xml/expat
${RM} -fr xml/expat
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf \
${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf \
--with-apr=../apr-${PORTVERSION}
cd ${WRKDIR}/apr-${PORTVERSION}; \
${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
cd ${WRKDIR}/apr-util-${PORTVERSION}; \
${SETENV} ${SCRIPTS_ENV} ${SH} \
${SETENV} ${CONFIGURE_ENV} ${SH} \
./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}
do-configure: