| 1 |
commit: e4cb484c2c7c5764e6701a00dd6dd1cff414d270 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 2 02:04:26 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 2 02:10:23 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4cb484c |
| 7 |
|
| 8 |
dev-lang/php: move fpm-systemd specific option to that SAPI |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
dev-lang/php/php-7.0.28.ebuild | 8 ++++++-- |
| 13 |
1 file changed, 6 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-lang/php/php-7.0.28.ebuild b/dev-lang/php/php-7.0.28.ebuild |
| 16 |
index 6757747f0ea..45b3218e4f6 100644 |
| 17 |
--- a/dev-lang/php/php-7.0.28.ebuild |
| 18 |
+++ b/dev-lang/php/php-7.0.28.ebuild |
| 19 |
@@ -301,7 +301,6 @@ src_configure() { |
| 20 |
$(use_enable sysvipc sysvmsg) |
| 21 |
$(use_enable sysvipc sysvsem) |
| 22 |
$(use_enable sysvipc sysvshm) |
| 23 |
- $(use_with systemd fpm-systemd) |
| 24 |
$(use_with tidy tidy "${EPREFIX}/usr") |
| 25 |
$(use_enable tokenizer tokenizer) |
| 26 |
$(use_enable wddx wddx) |
| 27 |
@@ -457,7 +456,12 @@ src_configure() { |
| 28 |
cli|cgi|embed|fpm|phpdbg) |
| 29 |
if [[ "${one_sapi}" == "${sapi}" ]] ; then |
| 30 |
sapi_conf+=( "--enable-${sapi}" ) |
| 31 |
- [[ "fpm" == "${sapi}" ]] && sapi_conf+=( $(use_with acl fpm-acl) ) |
| 32 |
+ if [[ "fpm" == "${sapi}" ]] ; then |
| 33 |
+ sapi_conf+=( |
| 34 |
+ $(use_with acl fpm-acl) |
| 35 |
+ $(use_with systemd fpm-systemd) |
| 36 |
+ ) |
| 37 |
+ fi |
| 38 |
else |
| 39 |
sapi_conf+=( "--disable-${sapi}" ) |
| 40 |
fi |
Archives