From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BE4FA13800E for ; Fri, 27 Jul 2012 16:11:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3F2CE056C; Fri, 27 Jul 2012 16:09:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 846CBE056C for ; Fri, 27 Jul 2012 16:09:08 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 26D751B40B5 for ; Fri, 27 Jul 2012 16:09:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C5A94E5441 for ; Fri, 27 Jul 2012 16:09:05 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1343349522.af51ce3147a053847d8831e796fb65b1931ee6f4.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: af51ce3147a053847d8831e796fb65b1931ee6f4 X-VCS-Branch: master Date: Fri, 27 Jul 2012 16:09:05 +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: 3796ce35-1b6c-4235-aff5-9d170e83e9d8 X-Archives-Hash: ed8f88786f9ca81f6f5773c1b71ba8ca commit: af51ce3147a053847d8831e796fb65b1931ee6f4 Author: jbergstroem bergstroem nu> AuthorDate: Fri Jul 27 00:37:24 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Jul 27 00:38:42 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=af51ce31 Make sure that we only choose one optional memory allocator Signed-off-by: jbergstroem bergstroem.nu> --- eclass/mysql-v2.eclass | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index fdf682b..13bdd9b 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -187,6 +187,10 @@ IUSE="${IUSE} +community profiling" && IUSE="${IUSE} sphinx" mysql_version_is_at_least "5.5" \ +&& REQUIRED_USE="tcmalloc? ( !jemalloc ) + jemalloc? ( !tcmalloc )" + +mysql_version_is_at_least "5.5" \ && IUSE="${IUSE} jemalloc" mysql_version_is_at_least "5.5" \