1 |
commit: 6281d2cb11113b133900fc184f7ab9c30e001d71 |
2 |
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> |
3 |
AuthorDate: Tue Mar 27 17:18:42 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 27 14:01:25 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6281d2cb |
7 |
|
8 |
apache-2.eclass: reflect MPM dependencies on thread useflag in REQUIRED_USE |
9 |
|
10 |
eclass/apache-2.eclass | 24 ++++++++++-------------- |
11 |
1 file changed, 10 insertions(+), 14 deletions(-) |
12 |
|
13 |
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass |
14 |
index ee70b2f222f..6f58331755c 100644 |
15 |
--- a/eclass/apache-2.eclass |
16 |
+++ b/eclass/apache-2.eclass |
17 |
@@ -110,8 +110,18 @@ _apache2_set_mpms() { |
18 |
REQUIRED_USE="${REQUIRED_USE} !apache2_mpms_${ompm}" |
19 |
fi |
20 |
done |
21 |
+ |
22 |
+ if has ${mpm} ${IUSE_MPMS_FORK} ; then |
23 |
+ REQUIRED_USE="${REQUIRED_USE} !threads" |
24 |
+ else |
25 |
+ REQUIRED_USE="${REQUIRED_USE} threads" |
26 |
+ fi |
27 |
REQUIRED_USE="${REQUIRED_USE} )" |
28 |
done |
29 |
+ |
30 |
+ if [[ "${PV}" != 2.2* ]] ; then |
31 |
+ REQUIRED_USE="${REQUIRED_USE} apache2_mpms_prefork? ( !apache2_modules_http2 )" |
32 |
+ fi |
33 |
} |
34 |
_apache2_set_mpms |
35 |
unset -f _apache2_set_mpms |
36 |
@@ -189,20 +199,6 @@ setup_mpm() { |
37 |
elog |
38 |
fi |
39 |
fi |
40 |
- |
41 |
- if has ${MY_MPM} ${IUSE_MPMS_THREAD} && ! use threads ; then |
42 |
- eerror "You have selected a threaded MPM but USE=threads is disabled" |
43 |
- die "invalid use flag combination" |
44 |
- fi |
45 |
- |
46 |
- if has ${MY_MPM} ${IUSE_MPMS_FORK} && use threads ; then |
47 |
- eerror "You have selected a non-threaded MPM but USE=threads is enabled" |
48 |
- die "invalid use flag combination" |
49 |
- fi |
50 |
- |
51 |
- if [[ "${PV}" != 2.2* ]] && [[ "${MY_MPM}" = *prefork* ]] && use apache2_modules_http2 ; then |
52 |
- die "http2 does not work with prefork MPM." |
53 |
- fi |
54 |
} |
55 |
|
56 |
# @VARIABLE: MODULE_CRITICAL |