diff options
| author |   Brian Evans <grknight@gentoo.org> | 2019-05-13 15:00:27 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2019-05-13 15:04:23 -0400 |
| commit | 61d7e42e3601a71418cbcdd11e40e3441a0ae8a7 (patch) | |
| tree | d455593ea74ed95e733462ab2e23057b7b7dc091 /dev-db/mariadb | |
| parent | dev-db/mariadb: Version bump for 10.2.24 (diff) | |
| download | gentoo-61d7e42e3601a71418cbcdd11e40e3441a0ae8a7.tar.gz gentoo-61d7e42e3601a71418cbcdd11e40e3441a0ae8a7.tar.bz2 gentoo-61d7e42e3601a71418cbcdd11e40e3441a0ae8a7.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-db/mariadb')
| -rw-r--r-- | dev-db/mariadb/mariadb-10.2.22-r1.ebuild | 6 | ||||
| -rw-r--r-- | dev-db/mariadb/mariadb-10.2.24.ebuild | 2 | ||||
| -rw-r--r-- | 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 38e851d55654..c9ef480b83b6 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 36f9e2203803..184959a17cc8 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 8d049d3508ee..75082171657c 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 |