From: Brian Evans <grknight@gentoo.org>
Date: Mon, 14 Sep 2015 19:41:49 +0000 (-0400)
Subject: eclass: Add innodb-snappy USE for >=mariadb-10.1.7 to mysql-{cmake,multilib}.eclass
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3925535abbc862c1a9d1cd376dc2ac2b4c0ed71d;p=gentoo.git

eclass: Add innodb-snappy USE for >=mariadb-10.1.7 to mysql-{cmake,multilib}.eclass

Signed-off-by: Brian Evans <grknight@gentoo.org>
---

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