diff options
Diffstat (limited to 'eclass/mysql-autotools.eclass')
| -rw-r--r-- | eclass/mysql-autotools.eclass | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass index 19054e50b323..f3aa85e298b3 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.9 2012/06/07 22:06:04 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.10 2012/11/01 23:57:50 robbat2 Exp $ # @ECLASS: mysql-autotools.eclass # @MAINTAINER: @@ -96,6 +96,12 @@ mysql-autotools_configure_minimal() { myconf="${myconf} --with-charset=latin1" myconf="${myconf} --with-collation=latin1_swedish_ci" fi + + # MariaDB requires this flag in order to link to GPLv3 readline v6 or greater + # A note is added to the configure output + if [[ "${PN}" == "mariadb" ]] && mysql_version_is_at_least "5.1.61" ; then + myconf="${myconf} --disable-distribution" + fi } # @FUNCTION: mysql-autotools_configure_common @@ -397,7 +403,7 @@ mysql-autotools_src_prepare() { popd >/dev/null fi - if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then + if pbxt_patch_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then einfo "Adding storage engine: PBXT" pushd "${S}"/storage >/dev/null i='pbxt' |