diff options
| author |   Brian Evans <grknight@gentoo.org> | 2014-06-04 01:17:11 +0000 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2014-06-04 01:17:11 +0000 |
| commit | 4bb88503a1b2cfb47187fccee3b1de1b80064354 (patch) | |
| tree | 653fd0f95331bc8271cfcf6a47a43d3800c44187 /eclass | |
| parent | bump (diff) | |
| download | gentoo-2-4bb88503a1b2cfb47187fccee3b1de1b80064354.tar.gz gentoo-2-4bb88503a1b2cfb47187fccee3b1de1b80064354.tar.bz2 gentoo-2-4bb88503a1b2cfb47187fccee3b1de1b80064354.zip | |
Sync mysql-v2.eclass from the mysql overlay
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/mysql-v2.eclass | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 72f78b336aa4..4d92d8d19532 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1280 2014/06/01 23:00:45 rhill Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1281 2014/06/04 01:17:11 grknight Exp $ + + 03 Jun 2014; Brian Evans <grknight@gentoo.org> mysql-v2.eclass: + Sync mysql-v2 eclass from the mysql overlay. 01 Jun 2014; Ryan Hill <rhill@gentoo.org> toolchain.eclass: If we keep the flag list sorted by version there's no need for this function diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 723b5b0f7e93..e9699c66ccbb 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.29 2014/05/15 03:18:47 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.30 2014/06/04 01:17:11 grknight Exp $ # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -264,7 +264,6 @@ fi if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then mysql_check_version_range "5.1.38 to 5.3.99" && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )" mysql_version_is_at_least "5.2" && DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )" - mysql_version_is_at_least "5.2.5" && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )" mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )" # Bug 441700 MariaDB >=5.3 include custom mytop mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )" @@ -802,7 +801,7 @@ mysql-v2_pkg_config() { #cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}" cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db [[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db - cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${EROOT}/${MY_DATADIR}'" + cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${EROOT}/${MY_DATADIR}' '--tmpdir=${EROOT}/${MYSQL_TMPDIR}'" einfo "Command: $cmd" eval $cmd \ >"${TMPDIR}"/mysql_install_db.log 2>&1 @@ -831,12 +830,13 @@ mysql-v2_pkg_config() { --user=mysql \ --log-warnings=0 \ --basedir=${EROOT}/usr \ - --datadir=${ROOT}/${MY_DATADIR} \ + --datadir=${EROOT}/${MY_DATADIR} \ --max_allowed_packet=8M \ --net_buffer_length=16K \ --default-storage-engine=MyISAM \ --socket=${socket} \ - --pid-file=${pidfile}" + --pid-file=${pidfile} + --tmpdir=${EROOT}/${MYSQL_TMPDIR}" #einfo "About to start mysqld: ${mysqld}" ebegin "Starting mysqld" einfo "Command ${mysqld}" |