| 1 |
commit: f44a1236fac5a45cb21d26e5e31583cc5bdd1ed8 |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 11 14:37:48 2016 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 11 14:38:09 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44a1236 |
| 7 |
|
| 8 |
dev-lang/php: new revisions fixing opcache installation location logic. |
| 9 |
|
| 10 |
We install the opcache extension with a call to dolib.so, which |
| 11 |
requires an earlier call to "into" to set its installation |
| 12 |
location. If the user enables any SAPIs other than apache2, that |
| 13 |
happens incidentally. However, if only the apache2 SAPI is enabled, |
| 14 |
the installation location is never set, ultimately causing the |
| 15 |
extension to fail to load. This is fixed by adding a call to "into" |
| 16 |
directly before the dolib.so call. |
| 17 |
|
| 18 |
Two calls to use_if_iuse were also replaced with the simpler "use". |
| 19 |
|
| 20 |
Gentoo-Bug: 550676 |
| 21 |
|
| 22 |
Package-Manager: portage-2.2.28 |
| 23 |
|
| 24 |
dev-lang/php/{php-5.6.23-r1.ebuild => php-5.6.23-r2.ebuild} | 5 +++-- |
| 25 |
dev-lang/php/{php-7.0.8.ebuild => php-7.0.8-r1.ebuild} | 5 +++-- |
| 26 |
2 files changed, 6 insertions(+), 4 deletions(-) |
| 27 |
|
| 28 |
diff --git a/dev-lang/php/php-5.6.23-r1.ebuild b/dev-lang/php/php-5.6.23-r2.ebuild |
| 29 |
similarity index 99% |
| 30 |
rename from dev-lang/php/php-5.6.23-r1.ebuild |
| 31 |
rename to dev-lang/php/php-5.6.23-r2.ebuild |
| 32 |
index 0696638..071afe4 100644 |
| 33 |
--- a/dev-lang/php/php-5.6.23-r1.ebuild |
| 34 |
+++ b/dev-lang/php/php-5.6.23-r2.ebuild |
| 35 |
@@ -255,7 +255,7 @@ php_install_ini() { |
| 36 |
dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" |
| 37 |
dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" |
| 38 |
|
| 39 |
- if use_if_iuse opcache; then |
| 40 |
+ if use opcache; then |
| 41 |
elog "Adding opcache to $PHP_EXT_INI_DIR" |
| 42 |
echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ |
| 43 |
"${D}/${PHP_EXT_INI_DIR}"/opcache.ini |
| 44 |
@@ -666,7 +666,8 @@ src_install() { |
| 45 |
done |
| 46 |
|
| 47 |
# Installing opcache module |
| 48 |
- if use_if_iuse opcache ; then |
| 49 |
+ if use opcache ; then |
| 50 |
+ into "${PHP_DESTDIR#${EPREFIX}}" |
| 51 |
dolib.so "modules/opcache$(get_libname)" |
| 52 |
fi |
| 53 |
|
| 54 |
|
| 55 |
diff --git a/dev-lang/php/php-7.0.8.ebuild b/dev-lang/php/php-7.0.8-r1.ebuild |
| 56 |
similarity index 99% |
| 57 |
rename from dev-lang/php/php-7.0.8.ebuild |
| 58 |
rename to dev-lang/php/php-7.0.8-r1.ebuild |
| 59 |
index 5925bb3..9bd1557 100644 |
| 60 |
--- a/dev-lang/php/php-7.0.8.ebuild |
| 61 |
+++ b/dev-lang/php/php-7.0.8-r1.ebuild |
| 62 |
@@ -246,7 +246,7 @@ php_install_ini() { |
| 63 |
dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" |
| 64 |
dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" |
| 65 |
|
| 66 |
- if use_if_iuse opcache; then |
| 67 |
+ if use opcache; then |
| 68 |
elog "Adding opcache to $PHP_EXT_INI_DIR" |
| 69 |
echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ |
| 70 |
"${D}/${PHP_EXT_INI_DIR}"/opcache.ini |
| 71 |
@@ -660,7 +660,8 @@ src_install() { |
| 72 |
done |
| 73 |
|
| 74 |
# Installing opcache module |
| 75 |
- if use_if_iuse opcache ; then |
| 76 |
+ if use opcache ; then |
| 77 |
+ into "${PHP_DESTDIR#${EPREFIX}}" |
| 78 |
dolib.so "modules/opcache$(get_libname)" |
| 79 |
fi |
Archives