| 1 |
commit: 0ef9172664b19b1cf2afe6cf97e85d77b549de95 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 26 00:35:28 2014 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 26 00:35:28 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0ef91726 |
| 7 |
|
| 8 |
Header sync |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mysql-cmake.eclass | 11 +++-------- |
| 12 |
eclass/mysql-multilib.eclass | 2 +- |
| 13 |
2 files changed, 4 insertions(+), 9 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass |
| 16 |
index 85444ee..b7f4799 100644 |
| 17 |
--- a/eclass/mysql-cmake.eclass |
| 18 |
+++ b/eclass/mysql-cmake.eclass |
| 19 |
@@ -1,6 +1,6 @@ |
| 20 |
# Copyright 1999-2014 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.25 2014/10/08 17:25:46 grknight Exp $ |
| 23 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.26 2014/11/26 00:34:41 grknight Exp $ |
| 24 |
|
| 25 |
# @ECLASS: mysql-cmake.eclass |
| 26 |
# @MAINTAINER: |
| 27 |
@@ -218,15 +218,10 @@ configure_cmake_standard() { |
| 28 |
) |
| 29 |
fi |
| 30 |
|
| 31 |
- if mysql_version_is_at_least "10.0.15"; then |
| 32 |
- # Disable mroonga until the groonga options can be analyzed |
| 33 |
- # Groonga is bundled in and lots of defaults and possible dep magic |
| 34 |
- # It can be a package on its own |
| 35 |
- mycmakeargs+=( -DWITHOUT_MROONGA=1 ) |
| 36 |
- fi |
| 37 |
- |
| 38 |
if in_iuse mroonga ; then |
| 39 |
use mroonga || mycmakeargs+=( -DWITHOUT_MROONGA=1 ) |
| 40 |
+ else |
| 41 |
+ mycmakeargs+=( -DWITHOUT_MROONGA=1 ) |
| 42 |
fi |
| 43 |
|
| 44 |
if in_iuse galera ; then |
| 45 |
|
| 46 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 47 |
index 881cf3e..ba5b299 100644 |
| 48 |
--- a/eclass/mysql-multilib.eclass |
| 49 |
+++ b/eclass/mysql-multilib.eclass |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2014 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.10 2014/10/08 17:25:46 grknight Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.11 2014/11/26 00:34:41 grknight Exp $ |
| 55 |
|
| 56 |
# @ECLASS: mysql-multilib.eclass |
| 57 |
# @MAINTAINER: |
Archives