diff options
| author |   Brian Evans <grknight@gentoo.org> | 2014-11-26 00:34:41 +0000 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2014-11-26 00:34:41 +0000 |
| commit | 9f786fc4bebe4a1f083b9378478ae485c847e929 (patch) | |
| tree | ada29ab24d348e15f63844f858a8d25b5ad76ea8 /eclass/mysql-cmake.eclass | |
| parent | Remove call to perl-module_pkg_postinst, does not do anything outside perl-core (diff) | |
| download | gentoo-2-9f786fc4bebe4a1f083b9378478ae485c847e929.tar.gz gentoo-2-9f786fc4bebe4a1f083b9378478ae485c847e929.tar.bz2 gentoo-2-9f786fc4bebe4a1f083b9378478ae485c847e929.zip | |
Sync eclasses from mysql overlay
Diffstat (limited to 'eclass/mysql-cmake.eclass')
| -rw-r--r-- | eclass/mysql-cmake.eclass | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 1f38c70d9d9c..b7f479947dee 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.25 2014/10/08 17:25:46 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.26 2014/11/26 00:34:41 grknight Exp $ # @ECLASS: mysql-cmake.eclass # @MAINTAINER: @@ -179,7 +179,6 @@ configure_cmake_standard() { -DWITH_MYISAMMRG_STORAGE_ENGINE=1 -DWITH_MYISAM_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1 - $(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE) ) if in_iuse pbxt ; then @@ -187,10 +186,19 @@ configure_cmake_standard() { fi if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then + + # Federated{,X} must be treated special otherwise they will not be built as plugins + if ! use extraengine ; then + mycmakeargs+=( + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 + -DPLUGIN_FEDERATED=0 + -DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1 + -DPLUGIN_FEDERATEDX=0 ) + fi + mycmakeargs+=( $(mysql-cmake_use_plugin oqgraph OQGRAPH) $(mysql-cmake_use_plugin sphinx SPHINX) - $(mysql-cmake_use_plugin extraengine FEDERATEDX) $(mysql-cmake_use_plugin tokudb TOKUDB) $(mysql-cmake_use_plugin pam AUTH_PAM) ) @@ -209,6 +217,23 @@ configure_cmake_standard() { $(cmake-utils_use odbc CONNECT_WITH_ODBC) ) fi + + if in_iuse mroonga ; then + use mroonga || mycmakeargs+=( -DWITHOUT_MROONGA=1 ) + else + mycmakeargs+=( -DWITHOUT_MROONGA=1 ) + fi + + if in_iuse galera ; then + mycmakeargs+=( $(cmake-utils_use_with galera WSREP) ) + fi + + if mysql_version_is_at_least "10.1.1" ; then + mycmakeargs+=( $(cmake-utils_use_with innodb-lz4 INNODB_LZ4) + $(cmake-utils_use_with innodb-lzo INNODB_LZO) ) + fi + else + mycmakeargs+=( $(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE) ) fi if [[ ${PN} == "percona-server" ]]; then @@ -275,6 +300,12 @@ 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 + if [[ -d "${S}"/storage/mroonga/vendor/groonga ]] ; then + rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga" + fi + epatch_user } |