| 1 |
robbat2 08/11/14 22:07:03 |
| 2 |
|
| 3 |
Modified: mysql.eclass |
| 4 |
Log: |
| 5 |
Bug #222279 - add undocumented support for selection of default charset and collation values. It works, but consider yourself unsupported if you use it. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.100 eclass/mysql.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.100&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.100&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.99&r2=1.100 |
| 13 |
|
| 14 |
Index: mysql.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v |
| 17 |
retrieving revision 1.99 |
| 18 |
retrieving revision 1.100 |
| 19 |
diff -p -w -b -B -u -u -r1.99 -r1.100 |
| 20 |
--- mysql.eclass 14 Nov 2008 04:48:28 -0000 1.99 |
| 21 |
+++ mysql.eclass 14 Nov 2008 22:07:03 -0000 1.100 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2007 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.99 2008/11/14 04:48:28 robbat2 Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.100 2008/11/14 22:07:03 robbat2 Exp $ |
| 27 |
|
| 28 |
# Author: Francesco Riosa (Retired) <vivo@g.o> |
| 29 |
# Maintainer: MySQL Team <mysql-bugs@g.o> |
| 30 |
@@ -315,7 +315,13 @@ configure_common() { |
| 31 |
&& myconf="${myconf} --without-ndb-debug" |
| 32 |
fi |
| 33 |
|
| 34 |
- if mysql_version_is_at_least "4.1" && ! use latin1 ; then |
| 35 |
+ if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then |
| 36 |
+ ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" |
| 37 |
+ ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." |
| 38 |
+ ewarn "You MUST file bugs without these variables set." |
| 39 |
+ myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}" |
| 40 |
+ myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}" |
| 41 |
+ elif mysql_version_is_at_least "4.1" && ! use latin1 ; then |
| 42 |
myconf="${myconf} --with-charset=utf8" |
| 43 |
myconf="${myconf} --with-collation=utf8_general_ci" |
| 44 |
else |
Archives