diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2008-11-14 22:07:03 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2008-11-14 22:07:03 +0000 |
| commit | 11873ee9d61404ac61624c4fbe92e6eb5a54ecef (patch) | |
| tree | bed290b1addd23fd4edbe408f6d875e0a00eb181 /eclass | |
| parent | Bug #177977, version bump. (diff) | |
| download | gentoo-2-11873ee9d61404ac61624c4fbe92e6eb5a54ecef.tar.gz gentoo-2-11873ee9d61404ac61624c4fbe92e6eb5a54ecef.tar.bz2 gentoo-2-11873ee9d61404ac61624c4fbe92e6eb5a54ecef.zip | |
Bug #222279 - add undocumented support for selection of default charset and collation values. It works, but consider yourself unsupported if you use it.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/mysql.eclass | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 58e131d92741..dbef0c5d9dd0 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.99 2008/11/14 04:48:28 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.100 2008/11/14 22:07:03 robbat2 Exp $ # Author: Francesco Riosa (Retired) <vivo@gentoo.org> # Maintainer: MySQL Team <mysql-bugs@gentoo.org> @@ -315,12 +315,18 @@ configure_common() { && myconf="${myconf} --without-ndb-debug" fi - if mysql_version_is_at_least "4.1" && ! use latin1 ; then - myconf="${myconf} --with-charset=utf8" - myconf="${myconf} --with-collation=utf8_general_ci" - else - myconf="${myconf} --with-charset=latin1" - myconf="${myconf} --with-collation=latin1_swedish_ci" + if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then + ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" + ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." + ewarn "You MUST file bugs without these variables set." + myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}" + myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}" + elif mysql_version_is_at_least "4.1" && ! use latin1 ; then + myconf="${myconf} --with-charset=utf8" + myconf="${myconf} --with-collation=utf8_general_ci" + else + myconf="${myconf} --with-charset=latin1" + myconf="${myconf} --with-collation=latin1_swedish_ci" fi if use embedded ; then |