Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql/
Date: Mon, 01 Jun 2020 23:17:04
Message-Id: 1591053390.03df35088276f459b96fddfea06753ea93b81989.whissi@gentoo
1 commit: 03df35088276f459b96fddfea06753ea93b81989
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 1 23:13:51 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 1 23:16:30 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03df3508
7
8 dev-db/mysql: fix pkg_config
9
10 Closes: https://bugs.gentoo.org/722118
11 Package-Manager: Portage-2.3.100, Repoman-2.3.22
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 dev-db/mysql/mysql-5.6.45-r2.ebuild | 15 ++++++++++++---
15 dev-db/mysql/mysql-5.7.30.ebuild | 15 ++++++++++++---
16 2 files changed, 24 insertions(+), 6 deletions(-)
17
18 diff --git a/dev-db/mysql/mysql-5.6.45-r2.ebuild b/dev-db/mysql/mysql-5.6.45-r2.ebuild
19 index 18821fa038c..87c3e81d635 100644
20 --- a/dev-db/mysql/mysql-5.6.45-r2.ebuild
21 +++ b/dev-db/mysql/mysql-5.6.45-r2.ebuild
22 @@ -601,11 +601,20 @@ mysql_init_vars() {
23
24 pkg_config() {
25 _getoptval() {
26 - local mypd="${EROOT%/}"/usr/bin/my_print_defaults
27 local section="$1"
28 local flag="--${2}="
29 local extra_options="${3}"
30 - "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
31 + local cmd=(
32 + "${EROOT%/}/usr/bin/my_print_defaults"
33 + "${extra_options}"
34 + "${section}"
35 + )
36 + local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
37 +
38 + if [[ ${#results[@]} -gt 0 ]] ; then
39 + # When option is set multiple times only return last value
40 + echo "${results[-1]}"
41 + fi
42 }
43 local old_MY_DATADIR="${MY_DATADIR}"
44 local old_HOME="${HOME}"
45 @@ -724,7 +733,7 @@ pkg_config() {
46 fi
47
48 local options
49 - local sqltmp="$(emktemp)"
50 + local sqltmp="$(emktemp "${EROOT%/}/tmp")"
51
52 # Fix bug 446200. Don't reference host my.cnf, needs to come first,
53 # see http://bugs.mysql.com/bug.php?id=31312
54
55 diff --git a/dev-db/mysql/mysql-5.7.30.ebuild b/dev-db/mysql/mysql-5.7.30.ebuild
56 index 4543221a9e4..71716b437ae 100644
57 --- a/dev-db/mysql/mysql-5.7.30.ebuild
58 +++ b/dev-db/mysql/mysql-5.7.30.ebuild
59 @@ -747,11 +747,20 @@ multilib_src_install_all() {
60
61 pkg_config() {
62 _getoptval() {
63 - local mypd="${EROOT%/}"/usr/bin/my_print_defaults
64 local section="$1"
65 local flag="--${2}="
66 local extra_options="${3}"
67 - "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
68 + local cmd=(
69 + "${EROOT%/}/usr/bin/my_print_defaults"
70 + "${extra_options}"
71 + "${section}"
72 + )
73 + local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
74 +
75 + if [[ ${#results[@]} -gt 0 ]] ; then
76 + # When option is set multiple times only return last value
77 + echo "${results[-1]}"
78 + fi
79 }
80 local old_MY_DATADIR="${MY_DATADIR}"
81 local old_HOME="${HOME}"
82 @@ -872,7 +881,7 @@ pkg_config() {
83 fi
84
85 local options
86 - local sqltmp="$(emktemp)"
87 + local sqltmp="$(emktemp "${EROOT%/}/tmp")"
88
89 # Fix bug 446200. Don't reference host my.cnf, needs to come first,
90 # see http://bugs.mysql.com/bug.php?id=31312