[gentoo-commits] repo/gentoo:master commit in: eclass/

[Robin H. Johnson]

commit:     e0eade9bb1cfde193b523ce0736009e0edb10f58
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 20:10:15 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 20:10:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0eade9b

eclass/mysql*: skip galera replication during pkg_config.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 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 6c88c719893..cfe684bc5db 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 a5a0b0b4ed4..1ba8ad36e03 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 fe379980a80..94a36dc4354 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}"