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 4307E138ACE for ; Tue, 18 Nov 2014 19:35:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE16DE0856; Tue, 18 Nov 2014 19:35:21 +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 766CDE0856 for ; Tue, 18 Nov 2014 19:35:21 +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 65ED13402EC for ; Tue, 18 Nov 2014 19:35:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10E25A675 for ; Tue, 18 Nov 2014 19:35:19 +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: <1416339310.589b9078fc13b36c13c7469a31920ce58a5eae82.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: 589b9078fc13b36c13c7469a31920ce58a5eae82 X-VCS-Branch: master Date: Tue, 18 Nov 2014 19:35:19 +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: 976745fc-769b-424c-b676-1047dcdfb0ef X-Archives-Hash: b3e56219bb4f5b32606c109359fa9c3a commit: 589b9078fc13b36c13c7469a31920ce58a5eae82 Author: Brian Evans gentoo org> AuthorDate: Tue Nov 18 19:35:10 2014 +0000 Commit: Brian Evans gentoo org> CommitDate: Tue Nov 18 19:35:10 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=589b9078 [eclass] Disable mroonga for now. Need to look into groonga options/deps --- eclass/mysql-cmake.eclass | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index c57401f..df21483 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -209,6 +209,14 @@ configure_cmake_standard() { $(cmake-utils_use odbc CONNECT_WITH_ODBC) ) fi + + if mysql_version_is_at_least "10.0.15"; then + # Disable mroonga until the groonga options can be analyzed + # Groonga is bundled in and lots of defaults and possible dep magic + # It can be a package on its own + mycmakeargs+=( -DWITHOUT_HA_MROONGA=1 ) + fi + if in_iuse galera ; then mycmakeargs+=( $(cmake-utils_use_with galera WSREP) ) fi