| 1 |
commit: 594654d60dffccc3bc6bacbe1e02aeaf976ecb9d |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 31 00:51:16 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=594654d6 |
| 7 |
|
| 8 |
dev-lang/php: remove redundant "if use odbc" 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...". |
| 12 |
|
| 13 |
Gentoo-Bug: 551526 |
| 14 |
|
| 15 |
Package-Manager: portage-2.2.20.1 |
| 16 |
|
| 17 |
dev-lang/php/php-5.6.15.ebuild | 6 ++---- |
| 18 |
dev-lang/php/php-7.0.0_rc5.ebuild | 6 ++---- |
| 19 |
2 files changed, 4 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-lang/php/php-5.6.15.ebuild b/dev-lang/php/php-5.6.15.ebuild |
| 22 |
index 43c6335..b886802 100644 |
| 23 |
--- a/dev-lang/php/php-5.6.15.ebuild |
| 24 |
+++ b/dev-lang/php/php-5.6.15.ebuild |
| 25 |
@@ -463,10 +463,8 @@ src_configure() { |
| 26 |
fi |
| 27 |
|
| 28 |
# ODBC support |
| 29 |
- if use odbc ; then |
| 30 |
- my_conf+=" |
| 31 |
- $(use_with odbc unixODBC ${EPREFIX}/usr)" |
| 32 |
- fi |
| 33 |
+ my_conf+=" |
| 34 |
+ $(use_with odbc unixODBC ${EPREFIX}/usr)" |
| 35 |
|
| 36 |
if use iodbc ; then |
| 37 |
my_conf+=" |
| 38 |
|
| 39 |
diff --git a/dev-lang/php/php-7.0.0_rc5.ebuild b/dev-lang/php/php-7.0.0_rc5.ebuild |
| 40 |
index 12bfcee..4819893 100644 |
| 41 |
--- a/dev-lang/php/php-7.0.0_rc5.ebuild |
| 42 |
+++ b/dev-lang/php/php-7.0.0_rc5.ebuild |
| 43 |
@@ -440,10 +440,8 @@ src_configure() { |
| 44 |
fi |
| 45 |
|
| 46 |
# ODBC support |
| 47 |
- if use odbc ; then |
| 48 |
- my_conf+=" |
| 49 |
- $(use_with odbc unixODBC ${EPREFIX}/usr)" |
| 50 |
- fi |
| 51 |
+ my_conf+=" |
| 52 |
+ $(use_with odbc unixODBC ${EPREFIX}/usr)" |
| 53 |
|
| 54 |
if use iodbc ; then |
| 55 |
my_conf+=" |
Archives