kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add a 'apache-mpm-shared' option to build all three MPMs as dynamic modules.

Browse source 
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.
This commit is contained in:
fhajny 2012-08-20 14:14:16 +00:00
parent 114b4ced90
commit cd1a7b2fc7
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
www/apache24/PLIST
View file

@ -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

14
www/apache24/options.mk
View file

@ -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