| 1 |
commit: e0eade9bb1cfde193b523ce0736009e0edb10f58 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 28 20:10:15 2017 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 28 20:10:29 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0eade9b |
| 7 |
|
| 8 |
eclass/mysql*: skip galera replication during pkg_config. |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/mysql-multilib-r1.eclass | 2 +- |
| 13 |
eclass/mysql-multilib.eclass | 2 +- |
| 14 |
eclass/mysql-v2.eclass | 2 +- |
| 15 |
3 files changed, 3 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass |
| 18 |
index 6c88c719893..cfe684bc5db 100644 |
| 19 |
--- a/eclass/mysql-multilib-r1.eclass |
| 20 |
+++ b/eclass/mysql-multilib-r1.eclass |
| 21 |
@@ -887,7 +887,7 @@ mysql-multilib-r1_pkg_config() { |
| 22 |
${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null |
| 23 |
for opt in grant-tables host-cache name-resolve networking slave-start \ |
| 24 |
federated ssl log-bin relay-log slow-query-log external-locking \ |
| 25 |
- ndbcluster log-slave-updates \ |
| 26 |
+ ndbcluster log-slave-updates wsrep-on \ |
| 27 |
; do |
| 28 |
optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" |
| 29 |
egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" |
| 30 |
|
| 31 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 32 |
index a5a0b0b4ed4..1ba8ad36e03 100644 |
| 33 |
--- a/eclass/mysql-multilib.eclass |
| 34 |
+++ b/eclass/mysql-multilib.eclass |
| 35 |
@@ -1044,7 +1044,7 @@ mysql-multilib_pkg_config() { |
| 36 |
${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null |
| 37 |
for opt in grant-tables host-cache name-resolve networking slave-start \ |
| 38 |
federated ssl log-bin relay-log slow-query-log external-locking \ |
| 39 |
- ndbcluster log-slave-updates \ |
| 40 |
+ ndbcluster log-slave-updates wsrep-on \ |
| 41 |
; do |
| 42 |
optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" |
| 43 |
egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" |
| 44 |
|
| 45 |
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass |
| 46 |
index fe379980a80..94a36dc4354 100644 |
| 47 |
--- a/eclass/mysql-v2.eclass |
| 48 |
+++ b/eclass/mysql-v2.eclass |
| 49 |
@@ -795,7 +795,7 @@ mysql-v2_pkg_config() { |
| 50 |
${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null |
| 51 |
for opt in grant-tables host-cache name-resolve networking slave-start \ |
| 52 |
federated ssl log-bin relay-log slow-query-log external-locking \ |
| 53 |
- ndbcluster log-slave-updates \ |
| 54 |
+ ndbcluster log-slave-updates wsrep-on \ |
| 55 |
; do |
| 56 |
optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" |
| 57 |
egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" |
Archives