Gentoo Archives: gentoo-commits

From: "Hanno Boeck (hanno)" <hanno@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
Date: Mon, 01 Feb 2010 19:16:08
Message-Id: E1Nc1kk-0001PT-Ie@stork.gentoo.org
1 hanno 10/02/01 19:16:06
2
3 Modified: mysql.eclass
4 Log:
5 adjust mysql.eclass to support 5.4/5.5
6
7 Revision Changes Path
8 1.128 eclass/mysql.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.128&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.128&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.127&r2=1.128
13
14 Index: mysql.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
17 retrieving revision 1.127
18 retrieving revision 1.128
19 diff -u -r1.127 -r1.128
20 --- mysql.eclass 1 Feb 2010 01:07:08 -0000 1.127
21 +++ mysql.eclass 1 Feb 2010 19:16:06 -0000 1.128
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2009 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.127 2010/02/01 01:07:08 robbat2 Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.128 2010/02/01 19:16:06 hanno Exp $
27
28 # @ECLASS: mysql.eclass
29 # @MAINTAINER:
30 @@ -85,7 +85,7 @@
31 MYSQL_COMMUNITY_FEATURES=1
32 elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
33 MYSQL_COMMUNITY_FEATURES=1
34 -elif [ "${PV#5.4}" != "${PV}" ]; then
35 +elif [ "${PV#5.4}" != "${PV}" ] || [ "${PV#5.4}" != "${PV}" ]; then
36 MYSQL_COMMUNITY_FEATURES=1
37 else
38 MYSQL_COMMUNITY_FEATURES=0
39 @@ -504,7 +504,7 @@
40 myconf="${myconf} --with-ndb-binlog"
41 fi
42
43 - if mysql_version_is_at_least "5.2" ; then
44 + if [ -e "${S}/storage/falcon" ] ; then
45 plugins="${plugins},falcon"
46 fi