Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Fri, 04 Mar 2022 10:13:08
Message-Id: 1646388774.412f32ed8c733160b3e22e146c3e399444c8bb2c.polynomial-c@gentoo
1 commit: 412f32ed8c733160b3e22e146c3e399444c8bb2c
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 4 09:53:10 2022 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 4 10:12:54 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=412f32ed
7
8 apache-2.eclass: Add support for systemd module
9
10 Bug: https://bugs.gentoo.org/834568
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 eclass/apache-2.eclass | 11 ++++++++++-
14 1 file changed, 10 insertions(+), 1 deletion(-)
15
16 diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
17 index cd930aaf54f4..e6ca32db3ea5 100644
18 --- a/eclass/apache-2.eclass
19 +++ b/eclass/apache-2.eclass
20 @@ -101,6 +101,9 @@ for module in ${IUSE_MODULES} ; do
21 http2)
22 IUSE+=" +apache2_modules_${module}"
23 ;;
24 + systemd)
25 + IUSE+=" systemd"
26 + ;;
27 *)
28 IUSE+=" apache2_modules_${module}"
29 ;;
30 @@ -163,6 +166,7 @@ RDEPEND="
31 >=dev-libs/openssl-1.0.2:0=
32 kernel_linux? ( sys-apps/util-linux )
33 )
34 + systemd? ( sys-apps/systemd )
35 "
36
37 DEPEND="${RDEPEND}"
38 @@ -347,7 +351,12 @@ setup_modules() {
39 MY_CONF+=( --disable-suexec )
40 fi
41
42 - for x in ${IUSE_MODULES} ; do
43 + if use systemd ; then
44 + MY_CONF+=( --enable-systemd=${mod_type} )
45 + MY_MODS+=( systemd )
46 + fi
47 +
48 + for x in ${IUSE_MODULES/ systemd} ; do
49 if use apache2_modules_${x} ; then
50 MY_CONF+=( --enable-${x}=${mod_type} )
51 MY_MODS+=( ${x} )