| 1 |
mabi 12/02/27 22:04:47 |
| 2 |
|
| 3 |
Modified: src_configure-v54.eblit src_configure-v53.eblit |
| 4 |
Log: |
| 5 |
rely on /etc/env.d/50oracle-instantclient-basic to provide oci configuration for php (bug #380581) |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha88/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-lang/php/files/eblits/src_configure-v54.eblit |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_configure-v54.eblit?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_configure-v54.eblit?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_configure-v54.eblit?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: src_configure-v54.eblit |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v54.eblit,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- src_configure-v54.eblit 18 Dec 2011 09:00:26 -0000 1.1 |
| 23 |
+++ src_configure-v54.eblit 27 Feb 2012 22:04:47 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2011 Gentoo Foundation |
| 26 |
+# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v54.eblit,v 1.1 2011/12/18 09:00:26 olemarkus Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v54.eblit,v 1.2 2012/02/27 22:04:47 mabi Exp $ |
| 30 |
|
| 31 |
eblit-php-src_configure() { |
| 32 |
addpredict /usr/share/snmp/mibs/.index |
| 33 |
@@ -161,12 +161,8 @@ |
| 34 |
|
| 35 |
# Oracle support |
| 36 |
if use oci8-instant-client ; then |
| 37 |
- OCI8IC_PKG="$(best_version dev-db/oracle-instantclient-basic | \ |
| 38 |
- sed -e 's|dev-db/oracle-instantclient-basic-||g' | \ |
| 39 |
- sed -e 's|-r.*||g')" |
| 40 |
- |
| 41 |
my_conf+=" |
| 42 |
- $(use_with oci8-instant-client oci8 "instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib")" |
| 43 |
+ $(use_with oci8-instant-client oci8) |
| 44 |
fi |
| 45 |
|
| 46 |
# PDO support |
| 47 |
@@ -186,7 +182,7 @@ |
| 48 |
$(use_with odbc pdo-odbc unixODBC,/usr)" |
| 49 |
if use oci8-instant-client ; then |
| 50 |
my_conf+=" |
| 51 |
- $(use_with oci8-instant-client pdo-oci "instantclient,/usr,${OCI8IC_PKG}" )" |
| 52 |
+ $(use_with oci8-instant-client pdo-oci)" |
| 53 |
fi |
| 54 |
fi |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
|
| 59 |
1.3 dev-lang/php/files/eblits/src_configure-v53.eblit |
| 60 |
|
| 61 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_configure-v53.eblit?rev=1.3&view=markup |
| 62 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_configure-v53.eblit?rev=1.3&content-type=text/plain |
| 63 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_configure-v53.eblit?r1=1.2&r2=1.3 |
| 64 |
|
| 65 |
Index: src_configure-v53.eblit |
| 66 |
=================================================================== |
| 67 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v53.eblit,v |
| 68 |
retrieving revision 1.2 |
| 69 |
retrieving revision 1.3 |
| 70 |
diff -u -r1.2 -r1.3 |
| 71 |
--- src_configure-v53.eblit 23 Dec 2011 17:16:42 -0000 1.2 |
| 72 |
+++ src_configure-v53.eblit 27 Feb 2012 22:04:47 -0000 1.3 |
| 73 |
@@ -1,6 +1,6 @@ |
| 74 |
-# Copyright 1999-2011 Gentoo Foundation |
| 75 |
+# Copyright 1999-2012 Gentoo Foundation |
| 76 |
# Distributed under the terms of the GNU General Public License v2 |
| 77 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v53.eblit,v 1.2 2011/12/23 17:16:42 olemarkus Exp $ |
| 78 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v53.eblit,v 1.3 2012/02/27 22:04:47 mabi Exp $ |
| 79 |
|
| 80 |
eblit-php-src_configure() { |
| 81 |
addpredict /usr/share/snmp/mibs/.index |
| 82 |
@@ -163,12 +163,8 @@ |
| 83 |
|
| 84 |
# Oracle support |
| 85 |
if use oci8-instant-client ; then |
| 86 |
- OCI8IC_PKG="$(best_version dev-db/oracle-instantclient-basic | \ |
| 87 |
- sed -e 's|dev-db/oracle-instantclient-basic-||g' | \ |
| 88 |
- sed -e 's|-r.*||g')" |
| 89 |
- |
| 90 |
my_conf+=" |
| 91 |
- $(use_with oci8-instant-client oci8 "instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib")" |
| 92 |
+ $(use_with oci8-instant-client oci8) |
| 93 |
fi |
| 94 |
|
| 95 |
# PDO support |
| 96 |
@@ -188,7 +184,7 @@ |
| 97 |
$(use_with odbc pdo-odbc unixODBC,/usr)" |
| 98 |
if use oci8-instant-client ; then |
| 99 |
my_conf+=" |
| 100 |
- $(use_with oci8-instant-client pdo-oci "instantclient,/usr,${OCI8IC_PKG}" )" |
| 101 |
+ $(use_with oci8-instant-client pdo-oci)" |
| 102 |
fi |
| 103 |
fi |
Archives