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 8D17D138A1A for ; Sun, 23 Nov 2014 02:32:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CB35E0920; Sun, 23 Nov 2014 02:32:35 +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 C1B11E0920 for ; Sun, 23 Nov 2014 02:32:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E78FF33E958 for ; Sun, 23 Nov 2014 02:32:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E6D9AB62 for ; Sun, 23 Nov 2014 02:32:32 +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: <1416709942.e408529291501537df6fc54b39f337b054f9e9b3.grknight@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 X-VCS-Committer-Name: Brian Evans X-VCS-Revision: e408529291501537df6fc54b39f337b054f9e9b3 X-VCS-Branch: master Date: Sun, 23 Nov 2014 02:32:32 +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: c059aff4-54be-4ad2-85f2-f3fdea9d790e X-Archives-Hash: c57d0c853e91f2716b28fa094133671b commit: e408529291501537df6fc54b39f337b054f9e9b3 Author: Brian Evans gentoo org> AuthorDate: Sun Nov 23 02:32:22 2014 +0000 Commit: Brian Evans gentoo org> CommitDate: Sun Nov 23 02:32:22 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e4085292 Add some provisions for mroonga. Still force it disabled until I can work on adding groonga and groonga-normalizer-mysql to the tree --- eclass/mysql-cmake.eclass | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index df21483..32caf80 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -217,6 +217,10 @@ configure_cmake_standard() { mycmakeargs+=( -DWITHOUT_HA_MROONGA=1 ) fi + if in_iuse mroonga ; then + use mroonga || mycmakeargs+=( -DWITHOUT_HA_MROONGA=1 ) + fi + if in_iuse galera ; then mycmakeargs+=( $(cmake-utils_use_with galera WSREP) ) fi @@ -291,6 +295,10 @@ mysql-cmake_src_prepare() { sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die fi + # Remove the bundled groonga if it exists + # There is no CMake flag, it simply checks for existance + [[ -d "${S}"/storage/mroonga/vendor/groonga ]] && rm -r "${S}"/storage/mroonga/vendor/groonga || die + epatch_user }