diff options
| author | fhajny <fhajny@pkgsrc.org> | 2012-08-20 14:14:16 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2012-08-20 14:14:16 +0000 |
| commit | cd1a7b2fc76d68159a0f5e9eebfb1d229a2e9b54 (patch) | |
| tree | 3124ebc61b9b60e9af04add31ee4d1c3838d05ce | |
| parent | 114b4ced909623a0eb183797b4cdc7e7e916db21 (diff) | |
| download | pkgsrc-cd1a7b2fc76d68159a0f5e9eebfb1d229a2e9b54.tar.gz | |
Add a 'apache-mpm-shared' option to build all three MPMs as dynamic modules.
If selected, the existing apache-mpm-event, apache-mpm-prefork and
apache-mpm-worker options determine which will be loaded in the default
config file.
Note: if worker is in the mix, the build will simply never build mod_cgi,
regardless of which MPM is the default.
| -rw-r--r-- | www/apache24/PLIST | 5 | ||||
| -rw-r--r-- | www/apache24/options.mk | 14 |
2 files changed, 15 insertions, 4 deletions
diff --git a/www/apache24/PLIST b/www/apache24/PLIST index f0c73787a07..d928bb39945 100644 --- a/www/apache24/PLIST +++ b/www/apache24/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2012/07/11 19:09:18 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.7 2012/08/20 14:14:16 fhajny Exp $ bin/ab bin/apxs bin/dbmmanage @@ -129,6 +129,9 @@ lib/httpd/mod_logio.so ${PLIST.lua}lib/httpd/mod_lua.so lib/httpd/mod_mime.so lib/httpd/mod_mime_magic.so +${PLIST.mpm-shared}lib/httpd/mod_mpm_event.so +${PLIST.mpm-shared}lib/httpd/mod_mpm_prefork.so +${PLIST.mpm-shared}lib/httpd/mod_mpm_worker.so lib/httpd/mod_negotiation.so lib/httpd/mod_proxy.so lib/httpd/mod_proxy_ajp.so diff --git a/www/apache24/options.mk b/www/apache24/options.mk index 16bdc8b9427..6de5ca76f5f 100644 --- a/www/apache24/options.mk +++ b/www/apache24/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.4 2012/07/11 19:09:18 ryoon Exp $ +# $NetBSD: options.mk,v 1.5 2012/08/20 14:14:16 fhajny Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_OPTIONS_REQUIRED_GROUPS= mpm PKG_OPTIONS_GROUP.mpm= apache-mpm-event apache-mpm-prefork apache-mpm-worker -PKG_SUPPORTED_OPTIONS= lua suexec +PKG_SUPPORTED_OPTIONS= lua suexec apache-mpm-shared PKG_SUGGESTED_OPTIONS= apache-mpm-prefork .include "../../mk/bsd.options.mk" @@ -18,7 +18,7 @@ PKG_SUGGESTED_OPTIONS= apache-mpm-prefork # prefork non-threaded, pre-forking web server # worker hybrid multi-threaded multi-process web server # -PLIST_VARS+= worker prefork +PLIST_VARS+= worker prefork mpm-shared .if !empty(PKG_OPTIONS:Mapache-mpm-event) CONFIGURE_ARGS+= --with-mpm=event PLIST.worker= yes @@ -27,7 +27,15 @@ CONFIGURE_ARGS+= --with-mpm=worker PLIST.worker= yes .else CONFIGURE_ARGS+= --with-mpm=prefork +. if empty(PKG_OPTIONS:Mapache-mpm-shared) PLIST.prefork= yes +. endif +.endif + +.if !empty(PKG_OPTIONS:Mapache-mpm-shared) +CONFIGURE_ARGS+= --enable-mpms-shared='prefork worker event' +PLIST.mpm-shared= yes +PLIST.worker= yes .endif BUILD_DEFS+= APACHE_MODULES |