commit: f6f502db9547ffff1f4476399ddbfbfbc3a325e2
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 3 01:55:59 2015 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Nov 3 03:47:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6f502db
dev-lang/php: remove two obsolete addpredict() calls.
We had two calls to addpredict() at the top of src_prepare().
Supposedly they were needed with USE="session sharedmem"; however,
testing shows that they are no longer necessary. The build succeeds
fine without the addpredict() calls, so we remove them.
Package-Manager: portage-2.2.20.1
dev-lang/php/php-5.6.15-r1.ebuild | 8 --------
dev-lang/php/php-7.0.0_rc6.ebuild | 8 --------
2 files changed, 16 deletions(-)
diff --git a/dev-lang/php/php-5.6.15-r1.ebuild
b/dev-lang/php/php-5.6.15-r1.ebuild
index c64fd9d..726c56a 100644
--- a/dev-lang/php/php-5.6.15-r1.ebuild
+++ b/dev-lang/php/php-5.6.15-r1.ebuild
@@ -291,14 +291,6 @@ php_set_ini_dir() {
}
src_prepare() {
- # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
- # ([empty session.save_path]/session_mm_[sapi][gid].sem)
- # there is no easy way to circumvent that, all php calls during
- # install use -n, so no php.ini file will be used.
- # As such, this is the easiest way to get around
- addpredict /session_mm_cli250.sem
- addpredict /session_mm_cli0.sem
-
# Change PHP branding
# Get the alpha/beta/rc version
sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
diff --git a/dev-lang/php/php-7.0.0_rc6.ebuild
b/dev-lang/php/php-7.0.0_rc6.ebuild
index 17e52e4..933cebe 100644
--- a/dev-lang/php/php-7.0.0_rc6.ebuild
+++ b/dev-lang/php/php-7.0.0_rc6.ebuild
@@ -281,14 +281,6 @@ php_set_ini_dir() {
}
src_prepare() {
- # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
- # ([empty session.save_path]/session_mm_[sapi][gid].sem)
- # there is no easy way to circumvent that, all php calls during
- # install use -n, so no php.ini file will be used.
- # As such, this is the easiest way to get around
- addpredict /session_mm_cli250.sem
- addpredict /session_mm_cli0.sem
-
# Change PHP branding
# Get the alpha/beta/rc version
sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \