| 1 |
commit: d4c95be246e07f93a3d7fac4dfcf91806e127843 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 27 18:17:17 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 27 18:19:55 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4c95be2 |
| 7 |
|
| 8 |
dev-db/mariadb: Consistently use mysqld section in pkg_config |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/651356 |
| 11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 12 |
|
| 13 |
dev-db/mariadb/mariadb-10.2.13.ebuild | 6 +++--- |
| 14 |
dev-db/mariadb/mariadb-10.3.5_rc.ebuild | 6 +++--- |
| 15 |
2 files changed, 6 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-db/mariadb/mariadb-10.2.13.ebuild b/dev-db/mariadb/mariadb-10.2.13.ebuild |
| 18 |
index d515e8570a6..cc2988c75ed 100644 |
| 19 |
--- a/dev-db/mariadb/mariadb-10.2.13.ebuild |
| 20 |
+++ b/dev-db/mariadb/mariadb-10.2.13.ebuild |
| 21 |
@@ -849,11 +849,11 @@ pkg_config() { |
| 22 |
|
| 23 |
unset tmp_mysqld_password_source |
| 24 |
fi |
| 25 |
- MYSQL_TMPDIR="$(_getoptval '--mysqld' tmpdir)" |
| 26 |
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)" |
| 27 |
# These are dir+prefix |
| 28 |
- MYSQL_RELAY_LOG="$(_getoptval '--mysqld' relay-log)" |
| 29 |
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)" |
| 30 |
MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} |
| 31 |
- MYSQL_LOG_BIN="$(_getoptval '--mysqld' log-bin)" |
| 32 |
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)" |
| 33 |
MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} |
| 34 |
|
| 35 |
if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then |
| 36 |
|
| 37 |
diff --git a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild |
| 38 |
index 0baa860a6a3..e155c7cf981 100644 |
| 39 |
--- a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild |
| 40 |
+++ b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild |
| 41 |
@@ -853,11 +853,11 @@ pkg_config() { |
| 42 |
|
| 43 |
unset tmp_mysqld_password_source |
| 44 |
fi |
| 45 |
- MYSQL_TMPDIR="$(_getoptval '--mysqld' tmpdir)" |
| 46 |
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)" |
| 47 |
# These are dir+prefix |
| 48 |
- MYSQL_RELAY_LOG="$(_getoptval '--mysqld' relay-log)" |
| 49 |
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)" |
| 50 |
MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} |
| 51 |
- MYSQL_LOG_BIN="$(_getoptval '--mysqld' log-bin)" |
| 52 |
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)" |
| 53 |
MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} |
| 54 |
|
| 55 |
if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then |
Archives