diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2009-02-28 10:49:50 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2009-02-28 10:49:50 +0000 |
| commit | 8fcace5373a8b8a7267a7fab031b5d053290b48e (patch) | |
| tree | 321df3a910f4e02e5672dd8a72d3d07e01d81366 /eclass/mysql.eclass | |
| parent | Automated update of use.local.desc (diff) | |
| download | historical-8fcace5373a8b8a7267a7fab031b5d053290b48e.tar.gz historical-8fcace5373a8b8a7267a7fab031b5d053290b48e.tar.bz2 historical-8fcace5373a8b8a7267a7fab031b5d053290b48e.zip | |
Back in 2006 we updated 4.1 and 5.0 per upstreams request that InnoDB was always build. However 5.1 never got updated, so do it now.
Diffstat (limited to 'eclass/mysql.eclass')
| -rw-r--r-- | eclass/mysql.eclass | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 05cf75538da1..a17265143343 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.106 2009/02/11 11:29:48 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.107 2009/02/28 10:49:50 robbat2 Exp $ # Author: Francesco Riosa (Retired) <vivo@gentoo.org> # Maintainer: MySQL Team <mysql-bugs@gentoo.org> @@ -74,7 +74,7 @@ mysql_version_is_at_least "5.1" \ # compile-time-only mysql_version_is_at_least "5.1.12" \ -&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )" +&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3" # BitKeeper dependency, compile-time only [[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client" @@ -126,9 +126,6 @@ mysql_version_is_at_least "5.0.18" \ && IUSE="${IUSE} max-idx-128" mysql_version_is_at_least "5.1" \ -&& IUSE="${IUSE} innodb" - -mysql_version_is_at_least "5.1" \ || IUSE="${IUSE} berkdb" mysql_version_is_at_least "5.1.12" \ @@ -441,9 +438,8 @@ configure_51() { elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" fi - if use innodb ; then - plugins="${plugins},innobase" - fi + # Upstream specifically requests that InnoDB always be built. + plugins="${plugins},innobase" # like configuration=max-no-ndb if use cluster ; then @@ -584,8 +580,7 @@ mysql_src_unpack() { if mysql_version_is_at_least "5.1.12" ; then rebuilddirlist="." # TODO: check this with a cmake expert - use innodb \ - && cmake \ + cmake \ -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \ "storage/innobase" |