commit: 61d7e42e3601a71418cbcdd11e40e3441a0ae8a7 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Mon May 13 19:00:27 2019 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Mon May 13 19:04:23 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d7e42e
dev-db/mariadb: Fix pkg_config issues when multiple values exist Closes: https://bugs.gentoo.org/685822 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Brian Evans <grknight <AT> gentoo.org> dev-db/mariadb/mariadb-10.2.22-r1.ebuild | 6 +++--- dev-db/mariadb/mariadb-10.2.24.ebuild | 2 +- dev-db/mariadb/mariadb-10.3.13.ebuild | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild index 38e851d5565..c9ef480b83b 100644 --- a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild +++ b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild @@ -813,11 +813,11 @@ pkg_config() { unset tmp_mysqld_password_source fi - MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)" + MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)" # These are dir+prefix - MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)" + MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)" MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} - MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)" + MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)" MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then diff --git a/dev-db/mariadb/mariadb-10.2.24.ebuild b/dev-db/mariadb/mariadb-10.2.24.ebuild index 36f9e220380..184959a17cc 100644 --- a/dev-db/mariadb/mariadb-10.2.24.ebuild +++ b/dev-db/mariadb/mariadb-10.2.24.ebuild @@ -739,7 +739,7 @@ mysql_init_vars() { pkg_config() { _getoptval() { - local mypd="${EROOT}"/usr/bin/my_print_defaults + local mypd="${EROOT}"usr/libexec/mariadb/my_print_defaults local section="$1" local flag="--${2}=" local extra_options="${3}" diff --git a/dev-db/mariadb/mariadb-10.3.13.ebuild b/dev-db/mariadb/mariadb-10.3.13.ebuild index 8d049d3508e..75082171657 100644 --- a/dev-db/mariadb/mariadb-10.3.13.ebuild +++ b/dev-db/mariadb/mariadb-10.3.13.ebuild @@ -814,11 +814,11 @@ pkg_config() { unset tmp_mysqld_password_source fi - MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)" + MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)" # These are dir+prefix - MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)" + MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)" MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} - MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)" + MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)" MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
