From e0eade9bb1cfde193b523ce0736009e0edb10f58 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 28 Oct 2017 13:10:15 -0700 Subject: [PATCH] eclass/mysql*: skip galera replication during pkg_config. Signed-off-by: Robin H. Johnson --- eclass/mysql-multilib-r1.eclass | 2 +- eclass/mysql-multilib.eclass | 2 +- eclass/mysql-v2.eclass | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass index 6c88c7198937..cfe684bc5db1 100644 --- a/eclass/mysql-multilib-r1.eclass +++ b/eclass/mysql-multilib-r1.eclass @@ -887,7 +887,7 @@ mysql-multilib-r1_pkg_config() { ${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null for opt in grant-tables host-cache name-resolve networking slave-start \ federated ssl log-bin relay-log slow-query-log external-locking \ - ndbcluster log-slave-updates \ + ndbcluster log-slave-updates wsrep-on \ ; do optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index a5a0b0b4ed42..1ba8ad36e037 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -1044,7 +1044,7 @@ mysql-multilib_pkg_config() { ${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null for opt in grant-tables host-cache name-resolve networking slave-start \ federated ssl log-bin relay-log slow-query-log external-locking \ - ndbcluster log-slave-updates \ + ndbcluster log-slave-updates wsrep-on \ ; do optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index fe379980a800..94a36dc43547 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -795,7 +795,7 @@ mysql-v2_pkg_config() { ${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null for opt in grant-tables host-cache name-resolve networking slave-start \ federated ssl log-bin relay-log slow-query-log external-locking \ - ndbcluster log-slave-updates \ + ndbcluster log-slave-updates wsrep-on \ ; do optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" -- 2.26.2