| 1 |
commit: 74ec204a022e4126ca35008c0c27d13645d8ca27 |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 5 14:09:53 2015 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 5 19:46:59 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74ec204a |
| 7 |
|
| 8 |
dev-lang/php: don't depend on versions of sys-libs/db that won't be detected. |
| 9 |
|
| 10 |
In bug #564824, Robert Förster noticed that there's an issue building |
| 11 |
PHP with both sys-libs/db-5.3 and sys-libs/db-6.0 installed. The root |
| 12 |
cause of the failure is that PHP attempts to autodetect sys-libs/db, |
| 13 |
but doesn't specifically look for db-5.3. When db-5.3 is not found, |
| 14 |
it falls back to /usr/include/db.h from version 6.0 and that version |
| 15 |
is incompatible. |
| 16 |
|
| 17 |
A similar issue exists with older 4.x versions, but not with db-4.5 |
| 18 |
through db-5.1. A fix has been sent upstream for db-5.3. In the |
| 19 |
meantime, we remove that and the older 4.x versions from $DEPEND. |
| 20 |
|
| 21 |
Gentoo-Bug: 564824 |
| 22 |
|
| 23 |
Package-Manager: portage-2.2.20.1 |
| 24 |
|
| 25 |
.../php/{php-5.6.15-r1.ebuild => php-5.6.15-r2.ebuild} | 16 +++++----------- |
| 26 |
.../{php-7.0.0_rc6.ebuild => php-7.0.0_rc6-r1.ebuild} | 16 +++++----------- |
| 27 |
2 files changed, 10 insertions(+), 22 deletions(-) |
| 28 |
|
| 29 |
diff --git a/dev-lang/php/php-5.6.15-r1.ebuild b/dev-lang/php/php-5.6.15-r2.ebuild |
| 30 |
similarity index 97% |
| 31 |
rename from dev-lang/php/php-5.6.15-r1.ebuild |
| 32 |
rename to dev-lang/php/php-5.6.15-r2.ebuild |
| 33 |
index 726c56a..434d127 100644 |
| 34 |
--- a/dev-lang/php/php-5.6.15-r1.ebuild |
| 35 |
+++ b/dev-lang/php/php-5.6.15-r2.ebuild |
| 36 |
@@ -81,21 +81,15 @@ DEPEND=" |
| 37 |
apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] |
| 38 |
<www-servers/apache-2.4[threads=] ) )" |
| 39 |
|
| 40 |
-# This wacky berkdb dependency really means "any 4.x or 5.x version of |
| 41 |
-# sys-libs/db". The ./configure flag is called --with-db4, but this is a |
| 42 |
-# misnomer since db5 also works (bug #521222). We really want to say |
| 43 |
-# "any 4.x or 5.x slot", but that's not possible. The safest thing to |
| 44 |
-# do is list all 4.x and 5.x slots in order of preference. |
| 45 |
+# The supported (that is, autodetected) versions of BDB are listed in |
| 46 |
+# the ./configure script. Other versions *work*, but we need to stick to |
| 47 |
+# the ones that can be detected to avoid a repeat of bug #564824. |
| 48 |
DEPEND="${DEPEND} |
| 49 |
- berkdb? ( || ( sys-libs/db:5.3 |
| 50 |
- sys-libs/db:5.1 |
| 51 |
+ berkdb? ( || ( sys-libs/db:5.1 |
| 52 |
sys-libs/db:4.8 |
| 53 |
sys-libs/db:4.7 |
| 54 |
sys-libs/db:4.6 |
| 55 |
- sys-libs/db:4.5 |
| 56 |
- sys-libs/db:4.4 |
| 57 |
- sys-libs/db:4.3 |
| 58 |
- sys-libs/db:4.2 ) ) |
| 59 |
+ sys-libs/db:4.5 ) ) |
| 60 |
bzip2? ( app-arch/bzip2 ) |
| 61 |
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) |
| 62 |
cjk? ( !gd? ( |
| 63 |
|
| 64 |
diff --git a/dev-lang/php/php-7.0.0_rc6.ebuild b/dev-lang/php/php-7.0.0_rc6-r1.ebuild |
| 65 |
similarity index 97% |
| 66 |
rename from dev-lang/php/php-7.0.0_rc6.ebuild |
| 67 |
rename to dev-lang/php/php-7.0.0_rc6-r1.ebuild |
| 68 |
index 933cebe..db4cc42 100644 |
| 69 |
--- a/dev-lang/php/php-7.0.0_rc6.ebuild |
| 70 |
+++ b/dev-lang/php/php-7.0.0_rc6-r1.ebuild |
| 71 |
@@ -81,21 +81,15 @@ DEPEND=" |
| 72 |
apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] |
| 73 |
<www-servers/apache-2.4[threads=] ) )" |
| 74 |
|
| 75 |
-# This wacky berkdb dependency really means "any 4.x or 5.x version of |
| 76 |
-# sys-libs/db". The ./configure flag is called --with-db4, but this is a |
| 77 |
-# misnomer since db5 also works (bug #521222). We really want to say |
| 78 |
-# "any 4.x or 5.x slot", but that's not possible. The safest thing to |
| 79 |
-# do is list all 4.x and 5.x slots in order of preference. |
| 80 |
+# The supported (that is, autodetected) versions of BDB are listed in |
| 81 |
+# the ./configure script. Other versions *work*, but we need to stick to |
| 82 |
+# the ones that can be detected to avoid a repeat of bug #564824. |
| 83 |
DEPEND="${DEPEND} |
| 84 |
- berkdb? ( || ( sys-libs/db:5.3 |
| 85 |
- sys-libs/db:5.1 |
| 86 |
+ berkdb? ( || ( sys-libs/db:5.1 |
| 87 |
sys-libs/db:4.8 |
| 88 |
sys-libs/db:4.7 |
| 89 |
sys-libs/db:4.6 |
| 90 |
- sys-libs/db:4.5 |
| 91 |
- sys-libs/db:4.4 |
| 92 |
- sys-libs/db:4.3 |
| 93 |
- sys-libs/db:4.2 ) ) |
| 94 |
+ sys-libs/db:4.5 ) ) |
| 95 |
bzip2? ( app-arch/bzip2 ) |
| 96 |
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) |
| 97 |
cjk? ( !gd? ( |
Archives