From: Michael Orlitzky Date: Mon, 12 Jan 2015 21:36:39 +0000 (-0500) Subject: Fix MySQL socket path when USE=mysqli or USE=pdo-mysql. X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=a220f0aab08ff1c98ddaca8924426cc502076cf6;p=mjo-overlay.git Fix MySQL socket path when USE=mysqli or USE=pdo-mysql. --- diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild index 32fd2bc..d3a34aa 100644 --- a/dev-lang/php/php-5.6.4-r1.ebuild +++ b/dev-lang/php/php-5.6.4-r1.ebuild @@ -477,16 +477,15 @@ src_configure() { my_conf+=" $(use_with mysql mysql $mysqllib)" my_conf+=" $(use_with mysqli mysqli $mysqlilib)" - local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)" - if use mysql ; then - my_conf+="${mysqlsock}" - elif use mysqli ; then - my_conf+="${mysqlsock}" - fi - # MySQL PDO support my_conf+=" $(use_with pdo-mysql pdo-mysql ${mysqllib})" + # If MySQL is enabled in any way, pass --with-mysql-sock to ./configure. + local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" + my_conf+=" $(use_with mysql mysql-sock $mysqlsock)" + my_conf+=" $(use_with mysqli mysql-sock $mysqlsock)" + my_conf+=" $(use_with pdo-mysql mysql-sock $mysqlsock)" + # Session support if use session ; then my_conf+="