| 1 |
commit: f6f502db9547ffff1f4476399ddbfbfbc3a325e2 |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 3 01:55:59 2015 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 3 03:47:17 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6f502db |
| 7 |
|
| 8 |
dev-lang/php: remove two obsolete addpredict() calls. |
| 9 |
|
| 10 |
We had two calls to addpredict() at the top of src_prepare(). |
| 11 |
Supposedly they were needed with USE="session sharedmem"; however, |
| 12 |
testing shows that they are no longer necessary. The build succeeds |
| 13 |
fine without the addpredict() calls, so we remove them. |
| 14 |
|
| 15 |
Package-Manager: portage-2.2.20.1 |
| 16 |
|
| 17 |
dev-lang/php/php-5.6.15-r1.ebuild | 8 -------- |
| 18 |
dev-lang/php/php-7.0.0_rc6.ebuild | 8 -------- |
| 19 |
2 files changed, 16 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-lang/php/php-5.6.15-r1.ebuild b/dev-lang/php/php-5.6.15-r1.ebuild |
| 22 |
index c64fd9d..726c56a 100644 |
| 23 |
--- a/dev-lang/php/php-5.6.15-r1.ebuild |
| 24 |
+++ b/dev-lang/php/php-5.6.15-r1.ebuild |
| 25 |
@@ -291,14 +291,6 @@ php_set_ini_dir() { |
| 26 |
} |
| 27 |
|
| 28 |
src_prepare() { |
| 29 |
- # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path |
| 30 |
- # ([empty session.save_path]/session_mm_[sapi][gid].sem) |
| 31 |
- # there is no easy way to circumvent that, all php calls during |
| 32 |
- # install use -n, so no php.ini file will be used. |
| 33 |
- # As such, this is the easiest way to get around |
| 34 |
- addpredict /session_mm_cli250.sem |
| 35 |
- addpredict /session_mm_cli0.sem |
| 36 |
- |
| 37 |
# Change PHP branding |
| 38 |
# Get the alpha/beta/rc version |
| 39 |
sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ |
| 40 |
|
| 41 |
diff --git a/dev-lang/php/php-7.0.0_rc6.ebuild b/dev-lang/php/php-7.0.0_rc6.ebuild |
| 42 |
index 17e52e4..933cebe 100644 |
| 43 |
--- a/dev-lang/php/php-7.0.0_rc6.ebuild |
| 44 |
+++ b/dev-lang/php/php-7.0.0_rc6.ebuild |
| 45 |
@@ -281,14 +281,6 @@ php_set_ini_dir() { |
| 46 |
} |
| 47 |
|
| 48 |
src_prepare() { |
| 49 |
- # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path |
| 50 |
- # ([empty session.save_path]/session_mm_[sapi][gid].sem) |
| 51 |
- # there is no easy way to circumvent that, all php calls during |
| 52 |
- # install use -n, so no php.ini file will be used. |
| 53 |
- # As such, this is the easiest way to get around |
| 54 |
- addpredict /session_mm_cli250.sem |
| 55 |
- addpredict /session_mm_cli0.sem |
| 56 |
- |
| 57 |
# Change PHP branding |
| 58 |
# Get the alpha/beta/rc version |
| 59 |
sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ |
Archives