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 9102F13873B for ; Tue, 4 Mar 2014 21:54:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A503E09DD; Tue, 4 Mar 2014 21:54:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA251E09DD for ; Tue, 4 Mar 2014 21:54:28 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CD7F633FDA6 for ; Tue, 4 Mar 2014 21:54:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 0069418875 for ; Tue, 4 Mar 2014 21:54:25 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1393970057.adf4c7d83fcddc88bb5a933bf4e50242de7b396e.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-cmake.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: adf4c7d83fcddc88bb5a933bf4e50242de7b396e X-VCS-Branch: master Date: Tue, 4 Mar 2014 21:54:25 +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: e0bd5f85-0485-4f6e-a592-e8d51658bddb X-Archives-Hash: d11ca3461b2bf08358c8150f7eda1fb9 commit: adf4c7d83fcddc88bb5a933bf4e50242de7b396e Author: Brian Evans tuffmail com> AuthorDate: Tue Mar 4 21:54:17 2014 +0000 Commit: Brian Evans lavabit com> CommitDate: Tue Mar 4 21:54:17 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=adf4c7d8 Move jemalloc block for MariaDB so minimal doesnt build bundled --- eclass/mysql-cmake.eclass | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index fa991c0..abc2bdc 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -215,12 +215,6 @@ configure_cmake_standard() { $(mysql-cmake_use_plugin pam AUTH_PAM) ) - if use jemalloc ; then - mycmakeargs+=( -DWITH_JEMALLOC="system" ) - else - mycmakeargs+=( -DWITH_JEMALLOC=no ) - fi - if mysql_version_is_at_least 10.0.5 ; then # CassandraSE needs Apache Thrift which is not in portage # TODO: Add use and deps for Connect SE external deps @@ -342,6 +336,14 @@ mysql-cmake_src_configure() { mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 ) fi + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then + if use jemalloc ; then + mycmakeargs+=( -DWITH_JEMALLOC="system" ) + else + mycmakeargs+=( -DWITH_JEMALLOC=no ) + fi + fi + configure_cmake_locale if use minimal ; then