From: Fabio Erculiani Date: Sun, 11 Jul 2010 08:22:40 +0000 (+0000) Subject: make mod_cgi and mod_cgid modular and handled via USE flags X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c934b08f7996d2cf659aa39eb53431300ad70013;p=gentoo.git make mod_cgi and mod_cgid modular and handled via USE flags --- diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index 3e383c1a1f46..0f533ef4d95d 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.20 2010/03/05 09:01:07 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.21 2010/07/11 08:22:40 lxnay Exp $ EAPI="2" @@ -245,14 +245,6 @@ setup_modules() { MY_CONF="${MY_CONF} --without-ssl --disable-ssl" fi - if use threads || has ${MY_MPM} ${IUSE_MPMS_THREAD} ; then - MY_CONF="${MY_CONF} --enable-cgid=${mod_type}" - MY_MODS="${MY_MODS} cgid" - else - MY_CONF="${MY_CONF} --enable-cgi=${mod_type}" - MY_MODS="${MY_MODS} cgi" - fi - if use suexec ; then elog "You can manipulate several configure options of suexec" elog "through the following environment variables:" @@ -576,6 +568,14 @@ apache-2_pkg_postinst() { mkdir -p "${ROOT}/var/www/localhost/htdocs" echo "

It works!

" > "${ROOT}/var/www/localhost/htdocs/index.html" fi + + echo + elog "Attention: cgi and cgid modules are now handled via APACHE2_MODULES flags" + elog "make sure to enable those in order to compile them. In general, you should" + elog "use 'cgi' with non-multithreaded MPMs (such as prefork) and 'cgid' with" + elog "multithreaded ones (such as worker)" + echo + } EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_install pkg_postinst