From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7D8D21396D1 for ; Tue, 8 Aug 2017 12:52:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 972A5E0BE6; Tue, 8 Aug 2017 12:52:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5EEB9E0BE6 for ; Tue, 8 Aug 2017 12:52:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F9563419BC for ; Tue, 8 Aug 2017 12:52:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42B4975D5 for ; Tue, 8 Aug 2017 12:52:55 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1502196562.03fea8701c3595e23b527ad18672c17c71d1c57d.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mariadb/mariadb-10.2.7-r2.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 03fea8701c3595e23b527ad18672c17c71d1c57d X-VCS-Branch: master Date: Tue, 8 Aug 2017 12:52:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5bb08d8f-1c26-4432-8cb5-14548c93b5e5 X-Archives-Hash: fb19c6724228d71987da1cd5daf16ca9 commit: 03fea8701c3595e23b527ad18672c17c71d1c57d Author: Brian Evans gentoo org> AuthorDate: Mon Aug 7 14:04:27 2017 +0000 Commit: Brian Evans gentoo org> CommitDate: Tue Aug 8 12:49:22 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03fea870 dev-db/mariadb: Fix pkg_config for bug 626866 Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-db/mariadb/mariadb-10.2.7-r2.ebuild | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.2.7-r2.ebuild b/dev-db/mariadb/mariadb-10.2.7-r2.ebuild index d81c738bfb0..fe874e46415 100644 --- a/dev-db/mariadb/mariadb-10.2.7-r2.ebuild +++ b/dev-db/mariadb/mariadb-10.2.7-r2.ebuild @@ -511,8 +511,8 @@ multilib_src_install() { mysql_init_vars # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used - if [[ -f "${D}${MY_INCLUDEDIR}/private/config.h" ]] ; then - rm "${D}${MY_INCLUDEDIR}/private/config.h" || die + if [[ -f "${D}/usr/include/mysql/private/config.h" ]] ; then + rm "${D}/usr/include/mysql/private/config.h" || die fi if ! multilib_is_native_abi && use server ; then @@ -743,12 +743,10 @@ multilib_src_test() { } mysql_init_vars() { - MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"} + MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"} MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} - MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"} - MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"} if [[ -z "${MY_DATADIR}" ]] ; then MY_DATADIR="" @@ -796,8 +794,8 @@ mysql_init_vars() { fi export MY_SHAREDSTATEDIR MY_SYSCONFDIR - export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR - export MY_INCLUDEDIR MY_DATADIR + export MY_LOCALSTATEDIR MY_LOGDIR + export MY_DATADIR } pkg_config() { @@ -931,12 +929,6 @@ pkg_config() { # see http://bugs.mysql.com/bug.php?id=31312 use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'" - local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql" - [[ -r "${help_tables}" ]] \ - && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ - || touch "${TMPDIR}/fill_help_tables.sql" - help_tables="${TMPDIR}/fill_help_tables.sql" - # Figure out which options we need to disable to do the setup local helpfile="${TMPDIR}/mysqld-help" "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null @@ -947,9 +939,6 @@ pkg_config() { optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" done - # But some options changed names - egrep -sq external-locking "${helpfile}" && \ - options="${options/skip-locking/skip-external-locking}" use prefix || options="${options} --user=mysql" @@ -969,11 +958,8 @@ pkg_config() { # http://dev.mysql.com/doc/mysql/en/time-zone-support.html "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null - local cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" ) + local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" ) [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" ) - if [[ -r "${help_tables}" ]] ; then - cat "${help_tables}" >> "${sqltmp}" - fi cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ) einfo "Command: ${cmd[*]}" "${cmd[@]}" \ @@ -992,13 +978,11 @@ pkg_config() { local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" local mysqld="${EROOT}/usr/sbin/mysqld \ ${options} \ - $(use prefix || echo --user=mysql) \ --log-warnings=0 \ --basedir=${EROOT}/usr \ --datadir=${ROOT}/${MY_DATADIR} \ --max_allowed_packet=8M \ --net_buffer_length=16K \ - --default-storage-engine=MyISAM \ --socket=${socket} \ --pid-file=${pidfile} --tmpdir=${ROOT}/${MYSQL_TMPDIR}"