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 B35FE1381F3 for ; Fri, 20 Sep 2013 22:29:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A189AE0B3D; Fri, 20 Sep 2013 22:29:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 278B8E0B37 for ; Fri, 20 Sep 2013 22:29:50 +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 EFC7633ECFC for ; Fri, 20 Sep 2013 22:29:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A521FE530A for ; Fri, 20 Sep 2013 22:29:47 +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: <1379698937.6b322d505e544db33c3f8b744f3071667a838f79.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: 6b322d505e544db33c3f8b744f3071667a838f79 X-VCS-Branch: master Date: Fri, 20 Sep 2013 22:29:47 +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: 58df141f-f7b5-4b77-a668-fe2be5479a93 X-Archives-Hash: 14949525dc313c0dd9af0fef86f7dc9b commit: 6b322d505e544db33c3f8b744f3071667a838f79 Author: Brian Evans lavabit com> AuthorDate: Fri Sep 20 17:42:17 2013 +0000 Commit: Brian Evans lavabit com> CommitDate: Fri Sep 20 17:42:17 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6b322d50 Remove mariadb-5.5.33 specific hacks that were fixed in 5.5.33a --- eclass/mysql-cmake.eclass | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 48378bd..c45218e 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -72,7 +72,7 @@ mysql-cmake_use_plugin() { if use $1 ; then echo "-DWITH_$2=1" else - echo "-D$2_DISABLED=1" + echo "-DWITHOUT_$2=1" fi } @@ -197,10 +197,10 @@ configure_cmake_standard() { $(mysql-cmake_use_plugin pam AUTH_PAM) ) - #Disable bundled copy of jemalloc - mycmakeargs+=( -DWITH_JEMALLOC=no ) if use jemalloc ; then - mycmakeargs+=( -DLIBJEMALLOC="jemalloc" ) + mycmakeargs+=( -DWITH_JEMALLOC="system" ) + else + mycmakeargs+=( -DWITH_JEMALLOC=no ) fi fi @@ -259,13 +259,6 @@ mysql-cmake_src_prepare() { fi if has tokudb ${IUSE} ; then - # Don't build TokuDB unless requested in configure - # Upstream bug https://mariadb.atlassian.net/browse/MDEV-5021 - if [[ "${PV}" == "5.5.33" ]] ; then - sed -i 's/"x86_64" AND/"x86_64" AND WITH_TOKUDB AND/' \ - "${S}/storage/tokudb/CMakeLists.txt" || die "sed failed for tokudb CMakeLists.txt" - fi - # Don't build bundled xz-utils rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"