| 1 |
grknight 14/06/04 01:17:11 |
| 2 |
|
| 3 |
Modified: ChangeLog mysql-v2.eclass |
| 4 |
Log: |
| 5 |
Sync mysql-v2.eclass from the mysql overlay |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1281 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1281&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1281&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1280&r2=1.1281 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1280 |
| 18 |
retrieving revision 1.1281 |
| 19 |
diff -u -r1.1280 -r1.1281 |
| 20 |
--- ChangeLog 1 Jun 2014 23:00:45 -0000 1.1280 |
| 21 |
+++ ChangeLog 4 Jun 2014 01:17:11 -0000 1.1281 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1280 2014/06/01 23:00:45 rhill Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1281 2014/06/04 01:17:11 grknight Exp $ |
| 27 |
+ |
| 28 |
+ 03 Jun 2014; Brian Evans <grknight@g.o> mysql-v2.eclass: |
| 29 |
+ Sync mysql-v2 eclass from the mysql overlay. |
| 30 |
|
| 31 |
01 Jun 2014; Ryan Hill <rhill@g.o> toolchain.eclass: |
| 32 |
If we keep the flag list sorted by version there's no need for this function |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.30 eclass/mysql-v2.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.30&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.30&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.29&r2=1.30 |
| 41 |
|
| 42 |
Index: mysql-v2.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v |
| 45 |
retrieving revision 1.29 |
| 46 |
retrieving revision 1.30 |
| 47 |
diff -u -r1.29 -r1.30 |
| 48 |
--- mysql-v2.eclass 15 May 2014 03:18:47 -0000 1.29 |
| 49 |
+++ mysql-v2.eclass 4 Jun 2014 01:17:11 -0000 1.30 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2014 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.29 2014/05/15 03:18:47 grknight Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.30 2014/06/04 01:17:11 grknight Exp $ |
| 55 |
|
| 56 |
# @ECLASS: mysql-v2.eclass |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -264,7 +264,6 @@ |
| 59 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 60 |
mysql_check_version_range "5.1.38 to 5.3.99" && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )" |
| 61 |
mysql_version_is_at_least "5.2" && DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )" |
| 62 |
- mysql_version_is_at_least "5.2.5" && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )" |
| 63 |
mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )" |
| 64 |
# Bug 441700 MariaDB >=5.3 include custom mytop |
| 65 |
mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )" |
| 66 |
@@ -802,7 +801,7 @@ |
| 67 |
#cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}" |
| 68 |
cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db |
| 69 |
[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db |
| 70 |
- cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${EROOT}/${MY_DATADIR}'" |
| 71 |
+ cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${EROOT}/${MY_DATADIR}' '--tmpdir=${EROOT}/${MYSQL_TMPDIR}'" |
| 72 |
einfo "Command: $cmd" |
| 73 |
eval $cmd \ |
| 74 |
>"${TMPDIR}"/mysql_install_db.log 2>&1 |
| 75 |
@@ -831,12 +830,13 @@ |
| 76 |
--user=mysql \ |
| 77 |
--log-warnings=0 \ |
| 78 |
--basedir=${EROOT}/usr \ |
| 79 |
- --datadir=${ROOT}/${MY_DATADIR} \ |
| 80 |
+ --datadir=${EROOT}/${MY_DATADIR} \ |
| 81 |
--max_allowed_packet=8M \ |
| 82 |
--net_buffer_length=16K \ |
| 83 |
--default-storage-engine=MyISAM \ |
| 84 |
--socket=${socket} \ |
| 85 |
- --pid-file=${pidfile}" |
| 86 |
+ --pid-file=${pidfile} |
| 87 |
+ --tmpdir=${EROOT}/${MYSQL_TMPDIR}" |
| 88 |
#einfo "About to start mysqld: ${mysqld}" |
| 89 |
ebegin "Starting mysqld" |
| 90 |
einfo "Command ${mysqld}" |
Archives