diff options
| author | ade <ade@FreeBSD.org> | 2006-02-28 05:56:43 +0000 |
|---|---|---|
| committer | ade <ade@FreeBSD.org> | 2006-02-28 05:56:43 +0000 |
| commit | 7b4c5cc839964fd826138e897e2fcace1cec21a9 (patch) | |
| tree | 0e66decbeab2776738a6ac95425f3887eca31e59 | |
| parent | 483fe24a4ffe1e2dc1914067bf0bb3f3825b0f66 (diff) | |
| download | FreeBSD-ports-7b4c5cc839964fd826138e897e2fcace1cec21a9.zip FreeBSD-ports-7b4c5cc839964fd826138e897e2fcace1cec21a9.tar.gz | |
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)
| -rw-r--r-- | devel/apr/Makefile | 11 | ||||
| -rw-r--r-- | devel/apr0/Makefile | 11 | ||||
| -rw-r--r-- | devel/apr1/Makefile | 11 | ||||
| -rw-r--r-- | devel/apr2/Makefile | 11 |
4 files changed, 24 insertions, 20 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile index 6c71689..ef33fce 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -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: diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile index 6c71689..ef33fce 100644 --- a/devel/apr0/Makefile +++ b/devel/apr0/Makefile @@ -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: diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index 6c71689..ef33fce 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -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: diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index 6c71689..ef33fce 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/Makefile @@ -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: |
