summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2015-09-14 15:41:49 -0400
committerBrian Evans <grknight@gentoo.org>2015-09-14 15:41:49 -0400
commit3925535abbc862c1a9d1cd376dc2ac2b4c0ed71d (patch)
treef4692fe8043dcf4a37b85959819508282fb9b1d7
parentsys-firmware/seabios: add upstream fix for building on hardened systems #559980 (diff)
downloadgentoo-3925535abbc862c1a9d1cd376dc2ac2b4c0ed71d.tar.gz
gentoo-3925535abbc862c1a9d1cd376dc2ac2b4c0ed71d.tar.bz2
gentoo-3925535abbc862c1a9d1cd376dc2ac2b4c0ed71d.zip
eclass: Add innodb-snappy USE for >=mariadb-10.1.7 to mysql-{cmake,multilib}.eclass
Signed-off-by: Brian Evans <grknight@gentoo.org>
-rw-r--r--eclass/mysql-cmake.eclass4
-rw-r--r--eclass/mysql-multilib.eclass4
2 files changed, 8 insertions, 0 deletions
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 8d026b0b4c3c..439066e76c3c 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -236,6 +236,10 @@ configure_cmake_standard() {
$(cmake-utils_use_with innodb-lzo INNODB_LZO) )
fi
+ if in_iuse innodb-snappy ; then
+ mycmakeargs+=( $(cmake-utils_use_with innodb-snappy INNODB_SNAPPY) )
+ fi
+
if mysql_version_is_at_least "10.1.2" ; then
mycmakeargs+=( $(mysql-cmake_use_plugin cracklib CRACKLIB_PASSWORD_CHECK ) )
fi
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 6f7b583c3a21..35f5d6961286 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -231,6 +231,9 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
# Choices are bzip2, lz4, lzma, lzo. bzip2 and lzma enabled by default as they are system libraries
mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} innodb-lz4 innodb-lzo"
+ # It can also compress with app-arch/snappy
+ mysql_version_is_at_least "10.1.7" && IUSE="${IUSE} innodb-snappy"
+
# 10.1.2 introduces a cracklib password checker
mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} cracklib"
fi
@@ -364,6 +367,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
"
mysql_version_is_at_least "10.1.2" && DEPEND="${DEPEND} cracklib? ( sys-libs/cracklib:0= )"
+ mysql_version_is_at_least "10.1.7" && DEPEND="${DEPEND} innodb-snappy? ( app-arch/snappy )"
fi
if [[ ${PN} == "percona-server" ]] ; then