[gentoo-commits] proj/mysql:master commit in: eclass/

["Brian Evans" <grknight@lavabit.com>]

commit:     f01e91e34a3f90f811fff493b83dcb0c52aadf8a
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Sep 18 20:31:58 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Sep 18 20:31:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f01e91e3

Eclass changes to support mariadb 5.5.33+

---
 eclass/mysql-cmake.eclass | 39 +++++++++++++++++++++++++++++++++------
 eclass/mysql-v2.eclass    | 14 +++++++++++++-
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index f21e855..5c2a3d3 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -67,6 +67,15 @@ mysql-cmake_disable_test() {
 	fi
 }
 
+mysql-cmake_use_plugin() {
+	[[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>"
+	if use $1 ; then
+		echo "-DWITH_$2=1"
+	else
+		echo "-D$2_DISABLED=1"
+	fi
+}
+
 # @FUNCTION: configure_cmake_locale
 # @DESCRIPTION:
 # Helper function to configure locale cmake options
@@ -181,13 +190,17 @@ configure_cmake_standard() {
 
 	if [[ ${PN} == "mariadb" ]]; then
 		mycmakeargs+=(
-			$(cmake-utils_use_with oqgraph OQGRAPH_STORAGE_ENGINE)
-			$(cmake-utils_use_with sphinx SPHINX_STORAGE_ENGINE)
-			$(cmake-utils_use_with extraengine FEDERATEDX_STORAGE_ENGINE)
+			$(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)
 		)
 
-		if ! use pam ; then
-			mycmakeargs+=( -DAUTH_PAM_DISABLED=1 )
+		#Disable bundled copy of jemalloc
+		mycmakeargs+=( -DWITH_JEMALLOC=no )
+		if use jemalloc ; then
+			mycmakeargs+=( -DLIBJEMALLOC="jemalloc" )
 		fi
 	fi
 
@@ -237,13 +250,27 @@ mysql-cmake_src_prepare() {
 	[[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
 
 	rm -f "scripts/mysqlbug"
-	if use jemalloc; then
+	if use jemalloc && ! ( [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.5.33"  ); then
 		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt"
 	fi
 
 	if use tcmalloc; then
 		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
 	fi
+
+	if has tokudb ${IUSE} ; then
+		# Don't build TokuDB unless requested in configure
+		# Upstream bug https://mariadb.atlassian.net/browse/MDEV-5021
+		if [[ "${PV}" == "5.5.33" ]] ; then
+			sed -i 's/"x86_64" AND/"x86_64" AND WITH_TOKUDB AND/' \
+				"${S}/storage/tokudb/CMakeLists.txt" || die "sed failed for tokudb CMakeLists.txt"
+		fi
+
+		# Don't build bundled xz-utils
+		rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" 
+		touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" 
+	fi
+
 	epatch_user
 }
 

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 6147297..3d2f73c 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -214,6 +214,8 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
 	mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph"
 	mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx"
 	mysql_version_is_at_least "5.2.10" && IUSE="${IUSE} pam"
+	mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} tokudb"
+	mysql_check_version_range "5.5.33 to 5.5.99" && IUSE="${IUSE} tokudb"
 fi
 
 if mysql_version_is_at_least "5.5"; then
@@ -254,6 +256,10 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
 	# Bug 441700 MariaDB >=5.3 include custom mytop
 	mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
+	has tokudb ${IUSE} && DEPEND="${DEPEND} tokudb? (
+		>=sys-devel/gcc-4.7[lto]
+		app-arch/xz-utils
+	)"
 fi
 
 # Having different flavours at the same time is not a good idea
@@ -340,7 +346,7 @@ pbxt_patch_available() {
 }
 
 pbxt_available() {
-	pbxt_patch_available || [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]
+	pbxt_patch_available || ( [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && mysql_check_version_range "5.1 to 5.5.32" )
 	return $?
 }
 
@@ -449,6 +455,12 @@ mysql-v2_pkg_setup() {
 		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup
 	fi
 
+	if has tokudb ${IUSE} && use tokudb && [[ $(gcc-version) < 4.7 ]] ; then
+		eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
+		eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+		die
+	fi
+
 }
 
 # @FUNCTION: mysql-v2_src_unpack