From 203d6a6e24a3b0452bb364fda0d925c65a375932 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 12 Jan 2015 14:58:30 -0500 Subject: [PATCH] Add the pdo-odbc USE flag. --- dev-lang/php/metadata.xml | 1 + dev-lang/php/php-5.6.4-r1.ebuild | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml index c05a424..662f6b6 100644 --- a/dev-lang/php/metadata.xml +++ b/dev-lang/php/metadata.xml @@ -19,6 +19,7 @@ Enables built-in opcode cache, replacing pecl-apc et.al Enable the bundled PDO extensions Enable the DBLIB (MSSQL) PDO driver + Enable the ODBC PDO driver Enable the PostgreSQL PDO driver Enable the SQLite PDO driver Enables the phar extension to provide phar archive support diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild index ee59459..1f6d8e3 100644 --- a/dev-lang/php/php-5.6.4-r1.ebuild +++ b/dev-lang/php/php-5.6.4-r1.ebuild @@ -69,9 +69,9 @@ IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls - oci8-instant-client odbc +opcache pcntl pdo pdo-dblib pdo-pgsql pdo-sqlite - +phar +posix postgres qdbm readline recode selinux +session sharedmem - +simplexml snmp soap sockets spell sqlite ssl + oci8-instant-client odbc +opcache pcntl pdo pdo-dblib pdo-odbc + pdo-pgsql pdo-sqlite+phar +posix postgres qdbm readline recode selinux + +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" @@ -179,6 +179,7 @@ REQUIRED_USE=" ) ) pdo-dblib? ( mssql ) + pdo-odbc? ( odbc ) pdo-pgsql? ( postgres ) pdo-sqlite? ( sqlite ) qdbm? ( !gdbm ) @@ -378,6 +379,7 @@ src_configure() { $(use_enable pcntl pcntl ) $(use_enable pdo pdo ) $(use_with pdo-dblib pdo-dblib ) + $(use_with pdo-odbc pdo-odbc unixODBC,"${EPREFIX}"/usr) $(use_with pdo-pgsql pdo-pgsql ) $(use_with pdo-sqlite pdo-sqlite "${EPREFIX}"/usr) $(use_enable phar phar ) @@ -466,9 +468,7 @@ src_configure() { # PDO support if use pdo ; then - my_conf+=" - $(use_with mysql pdo-mysql ${mysqllib}) - $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)" + my_conf+="$(use_with mysql pdo-mysql ${mysqllib})" if use oci8-instant-client ; then my_conf+=" $(use_with oci8-instant-client pdo-oci)" -- 2.44.2