From 17cfbfeee188fc6dab48404cddb87ad0674114f6 Mon Sep 17 00:00:00 2001 From: Clement Laforet Date: Wed, 21 Jan 2004 21:21:12 +0000 Subject: 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) --- www/apache2/Makefile | 2 ++ www/apache2/Makefile.modules | 3 +++ www/apache20/Makefile | 2 ++ www/apache20/Makefile.modules | 3 +++ 4 files changed, 10 insertions(+) (limited to 'www') 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 diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 2acca795e91f..c919f4092518 100644 --- a/www/apache20/Makefile +++ b/www/apache20/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/apache20/Makefile.modules b/www/apache20/Makefile.modules index 59eba703fe77..d172ac3e8175 100644 --- a/www/apache20/Makefile.modules +++ b/www/apache20/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 -- cgit v1.2.3