diff options
author | clement <clement@FreeBSD.org> | 2004-01-10 07:11:17 +0800 |
---|---|---|
committer | clement <clement@FreeBSD.org> | 2004-01-10 07:11:17 +0800 |
commit | 8f644dd76a425812edaa724440d4357f635fb7f6 (patch) | |
tree | 5a8f7d0318ceadd1a585526db0ef88b7449d29c2 /www/apache2 | |
parent | c1842dcd4066e4040bed4b66a2773f57511d9dd9 (diff) | |
download | freebsd-ports-gnome-8f644dd76a425812edaa724440d4357f635fb7f6.tar.gz freebsd-ports-gnome-8f644dd76a425812edaa724440d4357f635fb7f6.tar.zst freebsd-ports-gnome-8f644dd76a425812edaa724440d4357f635fb7f6.zip |
Mark apache2 as broken when devel/apr is installed and WITH_APR_FROM_PORTS
is not defined.
This workaround should avoid weird apache behaviours when apache is
linked against the wrong apr* libraries.
Time to add CONFLICTS_BUILD option to bsd.port.mk ?
Approved by: erwin (mentor) (implicity)
Diffstat (limited to 'www/apache2')
-rw-r--r-- | www/apache2/Makefile | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index ee695f8166e2..c9e0bb9b0ef6 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -74,16 +74,6 @@ USE_OPENSSL= yes CONFIGURE_ARGS+= --enable-static-support .endif -# Untested and may fail ! -.if defined(WITH_APR_FROM_PORTS) -. if defined (WITH_BDB) || defined(WITH_BERKELEYDB) -BROKEN= "You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is defined" -.endif -LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr -CONFIGURE_ARGS+= --with-apr=${LOCALBASE}/bin/apr-config \ - --with-apr-util=${LOCALBASE}/bin/apr-config -.endif - # for slave ports .if !defined(MASTERDIR) APACHEDIR= ${.CURDIR} @@ -100,6 +90,22 @@ CONFIGURE_ARGS+= --with-ldap \ .include <bsd.port.pre.mk> +# Untested and may fail ! +.if defined(WITH_APR_FROM_PORTS) +. if defined (WITH_BDB) || defined(WITH_BERKELEYDB) +BROKEN= "You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is defined" +.endif +LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr +CONFIGURE_ARGS+= --with-apr=${LOCALBASE}/bin/apr-config \ + --with-apr-util=${LOCALBASE}/bin/apr-config +.else +. if exists(${LOCALBASE}/lib/libapr-0.so) +BROKEN= "apr is installed and may conflict with apache one\ + (if you want to use apr port define WITH_APR_FROM_PORTS,\ + at your own risk)" +. endif +.endif + .include "${APACHEDIR}/Makefile.doc" .include "${APACHEDIR}/Makefile.modules" |