gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

mysql-multilib-r1.eclass: Use *_is_at_least from versionator eclass

Browse Source 
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
This commit is contained in:
Thomas Deutschmann
2016-09-26 20:46:34 +02:00
parent a78af2a7dc
commit c4da82b024
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eclass/mysql-multilib-r1.eclass
View File

@@ -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"