Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 17 Jul 2017 13:44:13
Message-Id: 1500299040.f9e06572ce465a8c0125b9297d4689763d80edb5.grknight@gentoo
1 commit: f9e06572ce465a8c0125b9297d4689763d80edb5
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 17 13:42:55 2017 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 17 13:44:00 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9e06572
7
8 mysql-multilib.eclass: Adjust REQUIRED_USE for GLEP73
9
10 eclass/mysql-multilib.eclass | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13 diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
14 index 570deadd259..c994e51d7a0 100644
15 --- a/eclass/mysql-multilib.eclass
16 +++ b/eclass/mysql-multilib.eclass
17 @@ -227,9 +227,9 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
18 # 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or perfomance suffers
19 mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml"
20 if [[ ${HAS_TOOLS_PATCH} ]] ; then
21 - REQUIRED_USE="${REQUIRED_USE} !server? ( !oqgraph !sphinx ) tokudb? ( jemalloc )"
22 + REQUIRED_USE="${REQUIRED_USE} !server? ( !oqgraph !sphinx ) tokudb? ( jemalloc !tcmalloc )"
23 else
24 - REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )"
25 + REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc !tcmalloc )"
26 fi
27 # MariaDB 10.1 introduces InnoDB/XtraDB compression with external libraries
28 # Choices are bzip2, lz4, lzma, lzo. bzip2 and lzma enabled by default as they are system libraries