diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2004-02-13 00:32:24 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2004-02-13 00:32:24 +0000 |
| commit | 815f710e2a64989747b3b108ea6cc5b788e47e4f (patch) | |
| tree | 524ad396cfd0e3bc8cb7f0d25fa8dd6e51b6468f /devel/apr1 | |
| parent | Update to adzap 20040104 (diff) | |
Unbreak on amd64.
Submitted by: Craig Rodrigues <rodrigc@crodrigues.org> (maintainer)
Notes
Notes:
svn path=/head/; revision=100800
Diffstat (limited to 'devel/apr1')
| -rw-r--r-- | devel/apr1/Makefile | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index 8bf899b3f56a..2c741b21aa36 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -39,15 +39,6 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR} -APR_CONF_ENV= CC="${CC}" CFLAGS="${CFLAGS}" ${CONFIGURE_ENV} \ - CONFIG_SHELL=/bin/sh - -APR_UTIL_CONF_ENV= \ - CC="${CC}" CFLAGS="${CFLAGS}" ${CONFIGURE_ENV} \ - CONFIG_SHELL=/bin/sh \ - CPPFLAGS="-I${PREFIX}/include" \ - LDFLAGS="-L${PREFIX}/lib" - APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \ --with-expat=${PREFIX} \ --with-iconv=${PREFIX} @@ -133,10 +124,18 @@ pre-configure: --with-apr=../apr-${PORTVERSION} do-configure: + @CONFIG_GUESS_DIRS=$$(${FIND} ${WRKDIR} -name config.guess -o -name config.sub \ + | ${XARGS} -n 1 ${DIRNAME}); \ + for _D in $${CONFIG_GUESS_DIRS}; do \ + ${CP} -f ${TEMPLATES}/config.guess $${_D}/config.guess; \ + ${CHMOD} a+rx $${_D}/config.guess; \ + ${CP} -f ${TEMPLATES}/config.sub $${_D}/config.sub; \ + ${CHMOD} a+rx $${_D}/config.sub; \ + done cd ${WRKDIR}/apr-${PORTVERSION}; \ - ${SETENV} ${APR_CONF_ENV} ./configure ${CONFIGURE_ARGS} + ${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS} cd ${WRKDIR}/apr-util-${PORTVERSION}; \ - ${SETENV} ${APR_UTIL_CONF_ENV} \ + ${SETENV} ${SCRIPTS_ENV} ${SH} \ ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS} do-build: |