diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2010-02-02 02:59:03 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2010-02-02 02:59:03 +0000 |
| commit | f6f9b8f931ff3952c8d504d8ae14b921513acb0e (patch) | |
| tree | 380b637b9da106970adb7acadbd8f675bf83dc85 /eclass/mysql.eclass | |
| parent | Update the 5.1 plugins list for innodb_plugin, and do not build the example e... (diff) | |
| download | gentoo-2-f6f9b8f931ff3952c8d504d8ae14b921513acb0e.tar.gz gentoo-2-f6f9b8f931ff3952c8d504d8ae14b921513acb0e.tar.bz2 gentoo-2-f6f9b8f931ff3952c8d504d8ae14b921513acb0e.zip | |
Refactor innodb/falcon stuff.
Diffstat (limited to 'eclass/mysql.eclass')
| -rw-r--r-- | eclass/mysql.eclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 0a9f28b6c7b6..530728ed7d3b 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.129 2010/02/02 02:46:52 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.130 2010/02/02 02:59:03 robbat2 Exp $ # @ECLASS: mysql.eclass # @MAINTAINER: @@ -497,8 +497,12 @@ configure_51() { elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" fi - # Upstream specifically requests that InnoDB always be built. - plugins="${plugins},innobase,innodb_plugin" + # Upstream specifically requests that InnoDB always be built: + # - innobase, innodb_plugin + # Build falcon if available for 6.x series. + for i in innobase innodb_plugin falcon ; do + [ -e "${S}"/storage/${i} ] && plugins="${plugins},${i}" + done # like configuration=max-no-ndb if use cluster ; then @@ -506,10 +510,6 @@ configure_51() { myconf="${myconf} --with-ndb-binlog" fi - if [ -e "${S}/storage/falcon" ] ; then - plugins="${plugins},falcon" - fi - myconf="${myconf} --with-plugins=${plugins}" } |