aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/apr/Makefile21
-rw-r--r--devel/apr0/Makefile21
-rw-r--r--devel/apr1/Makefile21
-rw-r--r--devel/apr2/Makefile21
4 files changed, 40 insertions, 44 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 8bf899b3f56a..2c741b21aa36 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/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:
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 8bf899b3f56a..2c741b21aa36 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/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:
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:
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 8bf899b3f56a..2c741b21aa36 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/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:
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 06:39:25 +0000