[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/

[Brian Evans]

commit:     76550cd5e5a279d7b5cbe2cf65d168c9160542af
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 00:36:11 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 00:36:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=76550cd5

dev-db/mariadb: Fix Mroonga Engine cmake option

Package-Manager: portage-2.2.26
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mariadb/ChangeLog              | 3 +++
 dev-db/mariadb/mariadb-10.1.10.ebuild | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 90434e2..33c0828 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  29 Dec 2015; Brian Evans <grknight@g.o> mariadb-10.1.10.ebuild:
+  dev-db/mariadb: Fix Mroonga Engine cmake option
+
   28 Dec 2015; Brian Evans <grknight@g.o> -mariadb-10.0.19.ebuild,
   -mariadb-10.0.22-r1.ebuild, -mariadb-10.0.22.ebuild, -mariadb-10.1.8.ebuild,
   -mariadb-10.1.9-r1.ebuild, -mariadb-10.1.9.ebuild, metadata.xml:

diff --git a/dev-db/mariadb/mariadb-10.1.10.ebuild b/dev-db/mariadb/mariadb-10.1.10.ebuild
index dad8418..578c46a 100644
--- a/dev-db/mariadb/mariadb-10.1.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.10.ebuild
@@ -95,9 +95,8 @@ src_configure(){
 			-DWITH_INNODB_LZ4=$(usex innodb-lz4)
 			-DWITH_INNODB_LZO=$(usex innodb-lzo)
 			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
+			-DPLUGIN_MROONGA=$(usex mroonga YES NO)
 		)
-
-		use mroonga || MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITHOUT_MROONGA=1 )
 	fi
 	mysql-multilib-r1_src_configure
 }