[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit:     e408529291501537df6fc54b39f337b054f9e9b3
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 23 02:32:22 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> 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
 }