summaryrefslogtreecommitdiff
path: root/www/apache2
diff options
context:
space:
mode:
authorClement Laforet <clement@FreeBSD.org>2004-01-21 21:21:12 +0000
committerClement Laforet <clement@FreeBSD.org>2004-01-21 21:21:12 +0000
commit17cfbfeee188fc6dab48404cddb87ad0674114f6 (patch)
tree2dd9fa581184d5d073ed63520efd5d13180e8941 /www/apache2
parent- Update to 1.6.2 (diff)
Add WITH_PTHREAD_LIBS and WITH_EXPERIMENTAL_THREADS.
These options are for people who want to directly link apache against libkse and libthr. Usage: WITH_EXPERIMENTAL_THREADS=YES Overrides default pthread detection behaviour. WITH_PTHREAD_LIBS={kse;thr} Lets you choose your pthread lib. Don't even try to use "c_r"... *** These options are unsupported *** But all gdb backtraces are welcome :-) AFAIK, apache works well, but mod_php4 (worker MPM) behavior is quite funny. All modules which use apr mutexes may crash with KSE. Since I'm working on it, if you have coredumps, feel free to send me the backtrace (you must compile libkse, apache and modules with debugging symbols). Don't forget to set kern.sugid_coredump to 1. (using CoreDumpDirectory in httpd.conf can help too)
Notes
Notes: svn path=/head/; revision=98727
Diffstat (limited to 'www/apache2')
-rw-r--r--www/apache2/Makefile2
-rw-r--r--www/apache2/Makefile.modules3
2 files changed, 5 insertions, 0 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 2acca795e91f..c919f4092518 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -111,6 +111,8 @@ BROKEN= "apr is installed and may conflict with apache one\
. endif
.endif
+WITH_PTHREAD_LIBS?= ${PTHREAD_LIBS:S/-l//}
+
.include "${APACHEDIR}/Makefile.doc"
.include "${APACHEDIR}/Makefile.modules"
diff --git a/www/apache2/Makefile.modules b/www/apache2/Makefile.modules
index 59eba703fe77..d172ac3e8175 100644
--- a/www/apache2/Makefile.modules
+++ b/www/apache2/Makefile.modules
@@ -172,6 +172,9 @@ _APACHE_MODULES+= ${LDAP_MODULES}
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
CFLAGS+= -DFREEBSD_THREAD_HACK
+. if defined(WITH_EXPERIMENTAL_THREADS)
+CONFIGURE_ARGS+= ac_cv_pthreads_lib=${WITH_PTHREAD_LIBS}
+. endif
. if !defined(WITH_CUSTOM_THREADS)
_APACHE_MODULES+= ${THREAD_MODULES}
. else