mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-26 09:46:09 +00:00
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)
This commit is contained in:
parent
d5fe3e849e
commit
7433b9218c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=97816
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user