| 1 |
hollow 08/02/06 21:20:41 |
| 2 |
|
| 3 |
Modified: depend.apache.eclass |
| 4 |
Log: |
| 5 |
add check_apache_threads_in; add APACHE_INCLUDEDIR; remove legacy APACHECTL |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.42 eclass/depend.apache.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/depend.apache.eclass?rev=1.42&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/depend.apache.eclass?rev=1.42&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/depend.apache.eclass?r1=1.41&r2=1.42 |
| 13 |
|
| 14 |
Index: depend.apache.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v |
| 17 |
retrieving revision 1.41 |
| 18 |
retrieving revision 1.42 |
| 19 |
diff -u -r1.41 -r1.42 |
| 20 |
--- depend.apache.eclass 6 Feb 2008 13:16:17 -0000 1.41 |
| 21 |
+++ depend.apache.eclass 6 Feb 2008 21:20:41 -0000 1.42 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2007 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.41 2008/02/06 13:16:17 hollow Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.42 2008/02/06 21:20:41 hollow Exp $ |
| 27 |
|
| 28 |
# @ECLASS: depend.apache.eclass |
| 29 |
# @MAINTAINER: apache-devs@g.o |
| 30 |
@@ -114,8 +114,7 @@ |
| 31 |
APXS="/usr/sbin/apxs2" |
| 32 |
APACHE_BIN="/usr/sbin/apache2" |
| 33 |
APACHE_CTL="/usr/sbin/apache2ctl" |
| 34 |
- # legacy alias |
| 35 |
- APACHECTL="${APACHE_CTL}" |
| 36 |
+ APACHE_INCLUDEDIR="/usr/include/apache2" |
| 37 |
APACHE_BASEDIR="/usr/$(get_libdir)/apache2" |
| 38 |
APACHE_CONFDIR="/etc/apache2" |
| 39 |
APACHE_MODULES_CONFDIR="${APACHE_CONFDIR}/modules.d" |
| 40 |
@@ -228,10 +227,35 @@ |
| 41 |
|
| 42 |
local myflag="${1:-threads}" |
| 43 |
|
| 44 |
- if ! use ${myflag}; then |
| 45 |
+ if ! use ${myflag} ; then |
| 46 |
echo |
| 47 |
eerror "You need to enable USE flag '${myflag}' to build a thread-safe version" |
| 48 |
eerror "of ${CATEGORY}/${PN} for use with www-servers/apache" |
| 49 |
die "Need missing USE flag '${myflag}'" |
| 50 |
fi |
| 51 |
} |
| 52 |
+ |
| 53 |
+# @FUNCTION: check_apache_threads_in |
| 54 |
+# @USAGE: <myforeign> [myflag] |
| 55 |
+# @DESCRIPTION: |
| 56 |
+# An ebuild calls this to make sure thread-safety is enabled in a foreign |
| 57 |
+# package if apache has been built with a threaded MPM. If the myflag parameter |
| 58 |
+# is not given it defaults to threads. |
| 59 |
+check_apache_threads_in() { |
| 60 |
+ debug-print-function $FUNCNAME $* |
| 61 |
+ |
| 62 |
+ if ! built_with_use www-servers/apache threads ; then |
| 63 |
+ return |
| 64 |
+ fi |
| 65 |
+ |
| 66 |
+ local myforeign="$1" |
| 67 |
+ local myflag="${2:-threads}" |
| 68 |
+ |
| 69 |
+ if ! built_with_use ${myforeign} ${myflag} ; then |
| 70 |
+ echo |
| 71 |
+ eerror "You need to enable USE flag '${myflag}' in ${myforeign} to" |
| 72 |
+ eerror "build a thread-safe version of ${CATEGORY}/${PN} for use" |
| 73 |
+ eerror "with www-servers/apache" |
| 74 |
+ die "Need missing USE flag '${myflag}' in ${myforeign}" |
| 75 |
+ fi |
| 76 |
+} |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
-- |
| 81 |
gentoo-commits@l.g.o mailing list |
Archives