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 B082713800E for ; Fri, 27 Jul 2012 16:09:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B582EE057F; 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 86B1BE0586 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 27E651B40B6 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 94A11E5455 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: <1343348140.ebb55ab1c0c5729ef905d13253e7c9f2ddb663ad.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-cmake.eclass eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: ebb55ab1c0c5729ef905d13253e7c9f2ddb663ad 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: 473e9439-3d43-4765-ab33-d364db170599 X-Archives-Hash: dea39b0e938208e4a31edabd1ad9b28c commit: ebb55ab1c0c5729ef905d13253e7c9f2ddb663ad Author: jbergstroem bergstroem nu> AuthorDate: Fri Jul 27 00:15:40 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Jul 27 00:15:40 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ebb55ab1 Add IUSE=jemalloc in addition to tcmalloc Signed-off-by: jbergstroem bergstroem.nu> --- eclass/mysql-cmake.eclass | 4 ++++ eclass/mysql-v2.eclass | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index dae7448..321c626 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -137,6 +137,10 @@ configure_cmake_standard() { mycmakeargs+=( -DWITH_SSL=0 ) fi + if mysql_version_is_at_least "5.5" && use jemalloc; then + mycmakeargs+=( -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' -DWITH_SAFEMALLOC=OFF ) + fi + if mysql_version_is_at_least "5.5" && use tcmalloc; then mycmakeargs+=( -DCMAKE_EXE_LINKER_FLAGS='-ltcmalloc' -DWITH_SAFEMALLOC=OFF ) fi diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index c4decea..fdf682b 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -187,6 +187,9 @@ IUSE="${IUSE} +community profiling" && IUSE="${IUSE} sphinx" mysql_version_is_at_least "5.5" \ +&& IUSE="${IUSE} jemalloc" + +mysql_version_is_at_least "5.5" \ && IUSE="${IUSE} tcmalloc" mysql_version_is_at_least "5.5.7" \ @@ -247,6 +250,9 @@ mysql_version_is_at_least "5.5.7" \ && DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )" mysql_version_is_at_least "5.5" \ +&& DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc )" + +mysql_version_is_at_least "5.5" \ && DEPEND="${DEPEND} tcmalloc? ( dev-util/google-perftools )" # dev-perl/DBD-mysql is needed by some scripts installed by MySQL