[patch] support only one mpm

apache-onempm.patch (text/plain), 4.32 KB, created by Benedikt Böhm (RETIRED) on 2005-04-22 02:06:22 UTC

Index: apache-2.0.54.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54.ebuild,v
retrieving revision 1.2
diff -u -b -B -r1.2 apache-2.0.54.ebuild
--- apache-2.0.54.ebuild	16 Apr 2005 20:53:57 -0000	1.2
+++ apache-2.0.54.ebuild	22 Apr 2005 09:05:12 -0000
@@ -9,6 +9,9 @@
 GENTOO_PATCHSTAMP="20050416"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
+MPM_THREAD="mpm-leader mpm-threadpool mpm-worker"
+MPM_NTHREAD="mpm-peruser mpm-prefork"
+
 DESCRIPTION="The Apache Web Server, Version 2.0.x"
 HOMEPAGE="http://httpd.apache.org/"
 #SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
@@ -18,7 +21,7 @@
 LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads"
+IUSE="apache2 debug doc ldap ${MPM_THREAD} ${MPM_NTHREAD} no-suexec ssl static-modules threads"
 
 RDEPEND="dev-lang/perl
 	~dev-libs/apr-0.9.6
@@ -35,6 +38,31 @@
 S="${WORKDIR}/httpd-${PV}"
 
 pkg_setup() {
+	MPM=0
+
+	for mpm in ${MPM_THREAD} ${MPM_NTHREAD}; do
+		if useq ${mpm}; then
+			if [ ${MPM} != 0 ]; then
+				echo
+				eerror
+				eerror "Only one MPM can be built, ${MPM} blocks ${mpm}"
+				eerror
+				die "You can build only one MPM"
+			fi
+			MPM=${mpm}
+		fi
+	done
+
+	if [ ${MPM} = 0 ]; then
+		if useq threads; then
+			einfo "Threads specified without a mpm-specification, using mpm-worker."
+			MPM="worker"
+		else
+			einfo "No MPM style was specified, defaulting to mpm-prefork."
+			MPM="prefork"
+		fi
+	fi
+
 	if use mpm-peruser; then
 		ewarn " -BIG- -FAT- -WARNING-"
 		ewarn ""
@@ -45,6 +73,20 @@
 		ewarn "Continuing in 5 seconds.."
 		sleep 5
 	fi
+	
+	for mpm in ${MPM_THREAD}; do
+		if use ${mpm}; then
+			ewarn " -BIG- -FAT- -WARNING-"
+			ewarn
+			ewarn "Some modules do are not written to be thread-safe, and may act"
+			ewarn "incorrectly or may even segfault if used with a MPM that uses "
+			ewarn "threads. Please investigate whether the modules you wish to use"
+			ewarn "will work correctly with threads before using a threads MPM"
+			ewarn
+			ewarn "Continuing in 5 seconds.."
+			sleep 5
+		fi
+	done
 }
 
 src_unpack() {
@@ -120,6 +162,7 @@
 			--enable-layout=Gentoo \
 			--with-program-name=apache2 \
 			--with-devrandom=/dev/urandom \
+			--with-mpm=${MPM} \
 			--host=${CHOST} ${MY_BUILTINS}"
 
 	# debugging support
@@ -127,14 +170,7 @@
 		myconf="${myconf} --enable-maintainer-mode"
 	fi
 
-	select_mpms
-
-	# now we build each mpm
-	for mpm in ${mpms}; do
-		# clean up
-		cd server; make clean; cd ..
-
-		./configure --with-mpm=${mpm} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
+	./configure ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
 
 		# we don't want to try and recompile the ssl_expr_parse.c file, because
 		# the lex source is broken
@@ -145,9 +181,6 @@
 
 		emake || die "problem compiling apache2"
 
-		mv apache2 apache2.${mpm}
-	done
-
 	# build ssl version of apache bench (ab-ssl)
 	if useq ssl; then
 		cd support
@@ -196,19 +229,6 @@
 	# the ssl version of apache bench
 	useq ssl && doexe support/ab-ssl
 
-	# install mpm bins
-	for mpm in ${mpms}; do
-		doexe ${S}/apache2.${mpm}
-	done
-
-	# symlink the default mpm
-	for i in prefork worker peruser threadpool leader; do
-	if [ -x ${D}/usr/sbin/apache2.${i} ]; then
-			dosym /usr/sbin/apache2.${i} /usr/sbin/apache2
-			break
-		fi
-	done
-
 	# modules.d config file snippets
 	insinto /etc/apache2/modules.d
 	doins ${GENTOO_PATCHDIR}/conf/modules.d/45_mod_dav.conf
@@ -355,24 +375,6 @@
 	einfo "USERDIR is set to: ${USERDIR}"
 }
 
-select_mpms() {
-	useq mpm-prefork && mpms="${mpms} prefork"
-	useq mpm-worker && mpms="${mpms} worker"
-	useq mpm-peruser && mpms="${mpms} peruser"
-	useq mpm-threadpool && mpms="${mpms} threadpool"
-	useq mpm-leader && mpms="${mpms} leader"
-
-	if [ "x${mpms}" = "x" ]; then
-		if useq threads; then
-			einfo "Threads specified without a mpm-specification, using mpm-worker."
-			mpms="worker"
-		else
-			einfo "No MPM style was specified, defaulting to mpm-prefork."
-			mpms="prefork"
-		fi
-	fi
-}
-
 parse_modules_config() {
 	local name=""
 	local disable=""