| 1 |
commit: a8ec177bc04cd7de2814c680b089177a4a15dc84 |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 31 00:56:26 2015 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 31 02:21:41 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ec177b |
| 7 |
|
| 8 |
dev-lang/php: remove redundant "if use iodbc" check. |
| 9 |
|
| 10 |
The use_with function doesn't do anything if its USE flag is disabled, |
| 11 |
so there's no reason to wrap use_with in "if use...". This use_with |
| 12 |
block was also merged with the one for USE=odbc. |
| 13 |
|
| 14 |
Gentoo-Bug: 551526 |
| 15 |
|
| 16 |
Package-Manager: portage-2.2.20.1 |
| 17 |
|
| 18 |
dev-lang/php/php-5.6.15.ebuild | 8 ++------ |
| 19 |
dev-lang/php/php-7.0.0_rc5.ebuild | 8 ++------ |
| 20 |
2 files changed, 4 insertions(+), 12 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-lang/php/php-5.6.15.ebuild b/dev-lang/php/php-5.6.15.ebuild |
| 23 |
index b886802..dd6915c 100644 |
| 24 |
--- a/dev-lang/php/php-5.6.15.ebuild |
| 25 |
+++ b/dev-lang/php/php-5.6.15.ebuild |
| 26 |
@@ -464,12 +464,8 @@ src_configure() { |
| 27 |
|
| 28 |
# ODBC support |
| 29 |
my_conf+=" |
| 30 |
- $(use_with odbc unixODBC ${EPREFIX}/usr)" |
| 31 |
- |
| 32 |
- if use iodbc ; then |
| 33 |
- my_conf+=" |
| 34 |
- $(use_with iodbc iodbc ${EPREFIX}/usr)" |
| 35 |
- fi |
| 36 |
+ $(use_with odbc unixODBC ${EPREFIX}/usr) |
| 37 |
+ $(use_with iodbc iodbc ${EPREFIX}/usr)" |
| 38 |
|
| 39 |
# Oracle support |
| 40 |
if use oci8-instant-client ; then |
| 41 |
|
| 42 |
diff --git a/dev-lang/php/php-7.0.0_rc5.ebuild b/dev-lang/php/php-7.0.0_rc5.ebuild |
| 43 |
index 4819893..f0e475a 100644 |
| 44 |
--- a/dev-lang/php/php-7.0.0_rc5.ebuild |
| 45 |
+++ b/dev-lang/php/php-7.0.0_rc5.ebuild |
| 46 |
@@ -441,12 +441,8 @@ src_configure() { |
| 47 |
|
| 48 |
# ODBC support |
| 49 |
my_conf+=" |
| 50 |
- $(use_with odbc unixODBC ${EPREFIX}/usr)" |
| 51 |
- |
| 52 |
- if use iodbc ; then |
| 53 |
- my_conf+=" |
| 54 |
- $(use_with iodbc iodbc ${EPREFIX}/usr)" |
| 55 |
- fi |
| 56 |
+ $(use_with odbc unixODBC ${EPREFIX}/usr) |
| 57 |
+ $(use_with iodbc iodbc ${EPREFIX}/usr)" |
| 58 |
|
| 59 |
# Oracle support |
| 60 |
if use oci8-instant-client ; then |
Archives