Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/eselect-php:master commit in: src/
Date: Fri, 11 Dec 2015 00:40:35
Message-Id: 1449781229.41eea178ac8b07da9795ef3ec4c77595037fdb2c.mjo@gentoo
1 commit: 41eea178ac8b07da9795ef3ec4c77595037fdb2c
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 10 21:00:29 2015 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 10 21:00:29 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=41eea178
7
8 Add the get_apache2_active_symlink_path() function.
9
10 The "active symlink" is used in two places: to determine the active
11 version, and to set it. Factor its magic out into a separate function.
12
13 src/php.eselect.in | 18 ++++++++++++++++++
14 1 file changed, 18 insertions(+)
15
16 diff --git a/src/php.eselect.in b/src/php.eselect.in
17 index 2ea8c3d..d882095 100644
18 --- a/src/php.eselect.in
19 +++ b/src/php.eselect.in
20 @@ -158,6 +158,24 @@ get_active_fpm() {
21 [[ -a "${target}" ]] && echo "${target}" | @SED@ -ne "${ver}"
22 }
23
24 +# The path to the active version of the apache2 module, which should
25 +# be a symlink. This is the path used by our apache configuration to
26 +# load the PHP module. The path is unversioned (that is, it has no "5"
27 +# or "7" in it) so that the apache configuration does not need to
28 +# change after the user eselects a different version.
29 +#
30 +# INPUT:
31 +#
32 +# None.
33 +#
34 +# OUTPUT:
35 +#
36 +# The path to our libphp.so symlink, which should (but is not
37 +# guaranteed to) point to a real apache DSO.
38 +#
39 +get_apache2_active_symlink_path() {
40 + echo "${EROOT}$(get_active_libdir)/apache2/modules/libphp.so"
41 +}
42
43 # Find the active (selected) version of the apache2 module. Used to
44 # decorate the output of the `eselect php list apache2` command.