diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2016-09-26 20:46:34 +0200 |
|---|---|---|
| committer |   Brian Evans <grknight@gentoo.org> | 2016-09-27 12:44:03 -0400 |
| commit | ef63412e7200ee99e779b9187293da57a229121b (patch) | |
| tree | 87716fc1352315660024f483203a7241425ea315 | |
| parent | mysql-cmake/mysql-multilib eclasses: set STACK_DIRECTION to fix cross-compiles (diff) | |
| download | mysql-ef63412e7200ee99e779b9187293da57a229121b.tar.gz mysql-ef63412e7200ee99e779b9187293da57a229121b.tar.bz2 mysql-ef63412e7200ee99e779b9187293da57a229121b.zip | |
mysql-multilib-r1.eclass: Use *_is_at_least from versionator eclass
Since dev-db/percona-server was bumped to EAPI=6 usage mysql_fx eclass is
no longer inherited [Link1] which results in an error like
> # emerge --config dev-db/percona-server
>
> Configuring pkg...
>
> * Creating the mysql database and setting proper permissions on it ...
> /var/tmp/portage/dev-db/percona-server-5.6.32.78.0/temp/environment: line 4697: mysql_version_is_at_least: command not found
To fix this problem I replaced the call to "mysql_version_is_at_least"
function from mysql_fx eclass with a call to "version_is_at_least" function
from versionator eclass we are already inheriting [Link2].
Link1: https://gitweb.gentoo.org/repo/gentoo.git/tree/eclass/mysql-multilib-r1.eclass?id=b3ae687988d49123628757aa8c5422bdd3b444fb#n46
Link2: https://gitweb.gentoo.org/repo/gentoo.git/tree/eclass/mysql-multilib-r1.eclass?id=b3ae687988d49123628757aa8c5422bdd3b444fb#n43
Gentoo-Bug: https://bugs.gentoo.org/594298
| -rw-r--r-- | eclass/mysql-multilib-r1.eclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass index 858b9b6..3f7372c 100644 --- a/eclass/mysql-multilib-r1.eclass +++ b/eclass/mysql-multilib-r1.eclass @@ -918,7 +918,7 @@ mysql-multilib-r1_pkg_config() { local cmd local initialize_options - if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.7.6" ; then + if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && version_is_at_least "5.7.6" ; then # --initialize-insecure will not set root password # --initialize would set a random one in the log which we don't need as we set it ourselves cmd="${EROOT}usr/sbin/mysqld" |