| 1 |
commit: 24cc464d62edb689021380d2573f107512b5371f |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 31 01:06:46 2015 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 31 02:21:42 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24cc464d |
| 7 |
|
| 8 |
dev-lang/php: remove second redundant "if use oci8-instant-client" check. |
| 9 |
|
| 10 |
This fixes the same issue as 7c05e6f, but in another spot in the ebuild. |
| 11 |
|
| 12 |
Gentoo-Bug: 551526 |
| 13 |
|
| 14 |
Package-Manager: portage-2.2.20.1 |
| 15 |
|
| 16 |
dev-lang/php/php-5.6.15.ebuild | 7 ++----- |
| 17 |
dev-lang/php/php-7.0.0_rc5.ebuild | 7 ++----- |
| 18 |
2 files changed, 4 insertions(+), 10 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-lang/php/php-5.6.15.ebuild b/dev-lang/php/php-5.6.15.ebuild |
| 21 |
index 3f663ec..7fc954c 100644 |
| 22 |
--- a/dev-lang/php/php-5.6.15.ebuild |
| 23 |
+++ b/dev-lang/php/php-5.6.15.ebuild |
| 24 |
@@ -478,11 +478,8 @@ src_configure() { |
| 25 |
$(use_with mysql pdo-mysql ${mysqllib}) |
| 26 |
$(use_with postgres pdo-pgsql ) |
| 27 |
$(use_with sqlite pdo-sqlite ${EPREFIX}/usr) |
| 28 |
- $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)" |
| 29 |
- if use oci8-instant-client ; then |
| 30 |
- my_conf+=" |
| 31 |
- $(use_with oci8-instant-client pdo-oci)" |
| 32 |
- fi |
| 33 |
+ $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr) |
| 34 |
+ $(use_with oci8-instant-client pdo-oci)" |
| 35 |
fi |
| 36 |
|
| 37 |
# readline/libedit support |
| 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 8043ddf..41ebf46 100644 |
| 41 |
--- a/dev-lang/php/php-7.0.0_rc5.ebuild |
| 42 |
+++ b/dev-lang/php/php-7.0.0_rc5.ebuild |
| 43 |
@@ -454,11 +454,8 @@ src_configure() { |
| 44 |
$(use_with mysql pdo-mysql ${mysqllib}) |
| 45 |
$(use_with postgres pdo-pgsql ) |
| 46 |
$(use_with sqlite pdo-sqlite ${EPREFIX}/usr) |
| 47 |
- $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)" |
| 48 |
- if use oci8-instant-client ; then |
| 49 |
- my_conf+=" |
| 50 |
- $(use_with oci8-instant-client pdo-oci)" |
| 51 |
- fi |
| 52 |
+ $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr) |
| 53 |
+ $(use_with oci8-instant-client pdo-oci)" |
| 54 |
fi |
| 55 |
|
| 56 |
# readline/libedit support |
Archives