| 1 |
commit: 03fea8701c3595e23b527ad18672c17c71d1c57d |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 7 14:04:27 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 8 12:49:22 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03fea870 |
| 7 |
|
| 8 |
dev-db/mariadb: Fix pkg_config for bug 626866 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-db/mariadb/mariadb-10.2.7-r2.ebuild | 28 ++++++---------------------- |
| 13 |
1 file changed, 6 insertions(+), 22 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-db/mariadb/mariadb-10.2.7-r2.ebuild b/dev-db/mariadb/mariadb-10.2.7-r2.ebuild |
| 16 |
index d81c738bfb0..fe874e46415 100644 |
| 17 |
--- a/dev-db/mariadb/mariadb-10.2.7-r2.ebuild |
| 18 |
+++ b/dev-db/mariadb/mariadb-10.2.7-r2.ebuild |
| 19 |
@@ -511,8 +511,8 @@ multilib_src_install() { |
| 20 |
mysql_init_vars |
| 21 |
|
| 22 |
# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used |
| 23 |
- if [[ -f "${D}${MY_INCLUDEDIR}/private/config.h" ]] ; then |
| 24 |
- rm "${D}${MY_INCLUDEDIR}/private/config.h" || die |
| 25 |
+ if [[ -f "${D}/usr/include/mysql/private/config.h" ]] ; then |
| 26 |
+ rm "${D}/usr/include/mysql/private/config.h" || die |
| 27 |
fi |
| 28 |
|
| 29 |
if ! multilib_is_native_abi && use server ; then |
| 30 |
@@ -743,12 +743,10 @@ multilib_src_test() { |
| 31 |
} |
| 32 |
|
| 33 |
mysql_init_vars() { |
| 34 |
- MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"} |
| 35 |
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"} |
| 36 |
MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} |
| 37 |
MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} |
| 38 |
MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} |
| 39 |
- MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"} |
| 40 |
- MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"} |
| 41 |
|
| 42 |
if [[ -z "${MY_DATADIR}" ]] ; then |
| 43 |
MY_DATADIR="" |
| 44 |
@@ -796,8 +794,8 @@ mysql_init_vars() { |
| 45 |
fi |
| 46 |
|
| 47 |
export MY_SHAREDSTATEDIR MY_SYSCONFDIR |
| 48 |
- export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR |
| 49 |
- export MY_INCLUDEDIR MY_DATADIR |
| 50 |
+ export MY_LOCALSTATEDIR MY_LOGDIR |
| 51 |
+ export MY_DATADIR |
| 52 |
} |
| 53 |
|
| 54 |
pkg_config() { |
| 55 |
@@ -931,12 +929,6 @@ pkg_config() { |
| 56 |
# see http://bugs.mysql.com/bug.php?id=31312 |
| 57 |
use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'" |
| 58 |
|
| 59 |
- local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql" |
| 60 |
- [[ -r "${help_tables}" ]] \ |
| 61 |
- && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ |
| 62 |
- || touch "${TMPDIR}/fill_help_tables.sql" |
| 63 |
- help_tables="${TMPDIR}/fill_help_tables.sql" |
| 64 |
- |
| 65 |
# Figure out which options we need to disable to do the setup |
| 66 |
local helpfile="${TMPDIR}/mysqld-help" |
| 67 |
"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null |
| 68 |
@@ -947,9 +939,6 @@ pkg_config() { |
| 69 |
optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" |
| 70 |
egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" |
| 71 |
done |
| 72 |
- # But some options changed names |
| 73 |
- egrep -sq external-locking "${helpfile}" && \ |
| 74 |
- options="${options/skip-locking/skip-external-locking}" |
| 75 |
|
| 76 |
use prefix || options="${options} --user=mysql" |
| 77 |
|
| 78 |
@@ -969,11 +958,8 @@ pkg_config() { |
| 79 |
# http://dev.mysql.com/doc/mysql/en/time-zone-support.html |
| 80 |
"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null |
| 81 |
|
| 82 |
- local cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" ) |
| 83 |
+ local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" ) |
| 84 |
[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" ) |
| 85 |
- if [[ -r "${help_tables}" ]] ; then |
| 86 |
- cat "${help_tables}" >> "${sqltmp}" |
| 87 |
- fi |
| 88 |
cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ) |
| 89 |
einfo "Command: ${cmd[*]}" |
| 90 |
"${cmd[@]}" \ |
| 91 |
@@ -992,13 +978,11 @@ pkg_config() { |
| 92 |
local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" |
| 93 |
local mysqld="${EROOT}/usr/sbin/mysqld \ |
| 94 |
${options} \ |
| 95 |
- $(use prefix || echo --user=mysql) \ |
| 96 |
--log-warnings=0 \ |
| 97 |
--basedir=${EROOT}/usr \ |
| 98 |
--datadir=${ROOT}/${MY_DATADIR} \ |
| 99 |
--max_allowed_packet=8M \ |
| 100 |
--net_buffer_length=16K \ |
| 101 |
- --default-storage-engine=MyISAM \ |
| 102 |
--socket=${socket} \ |
| 103 |
--pid-file=${pidfile} |
| 104 |
--tmpdir=${ROOT}/${MYSQL_TMPDIR}" |
Archives