| 1 |
robbat2 09/02/28 10:49:50 |
| 2 |
|
| 3 |
Modified: mysql.eclass |
| 4 |
Log: |
| 5 |
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. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.107 eclass/mysql.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.107&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.107&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.106&r2=1.107 |
| 13 |
|
| 14 |
Index: mysql.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v |
| 17 |
retrieving revision 1.106 |
| 18 |
retrieving revision 1.107 |
| 19 |
diff -p -w -b -B -u -u -r1.106 -r1.107 |
| 20 |
--- mysql.eclass 11 Feb 2009 11:29:48 -0000 1.106 |
| 21 |
+++ mysql.eclass 28 Feb 2009 10:49:50 -0000 1.107 |
| 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.106 2009/02/11 11:29:48 robbat2 Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.107 2009/02/28 10:49:50 robbat2 Exp $ |
| 27 |
|
| 28 |
# Author: Francesco Riosa (Retired) <vivo@g.o> |
| 29 |
# Maintainer: MySQL Team <mysql-bugs@g.o> |
| 30 |
@@ -74,7 +74,7 @@ mysql_version_is_at_least "5.1" \ |
| 31 |
|
| 32 |
# compile-time-only |
| 33 |
mysql_version_is_at_least "5.1.12" \ |
| 34 |
-&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )" |
| 35 |
+&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3" |
| 36 |
|
| 37 |
# BitKeeper dependency, compile-time only |
| 38 |
[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client" |
| 39 |
@@ -126,9 +126,6 @@ mysql_version_is_at_least "5.0.18" \ |
| 40 |
&& IUSE="${IUSE} max-idx-128" |
| 41 |
|
| 42 |
mysql_version_is_at_least "5.1" \ |
| 43 |
-&& IUSE="${IUSE} innodb" |
| 44 |
- |
| 45 |
-mysql_version_is_at_least "5.1" \ |
| 46 |
|| IUSE="${IUSE} berkdb" |
| 47 |
|
| 48 |
mysql_version_is_at_least "5.1.12" \ |
| 49 |
@@ -441,9 +438,8 @@ configure_51() { |
| 50 |
elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" |
| 51 |
fi |
| 52 |
|
| 53 |
- if use innodb ; then |
| 54 |
+ # Upstream specifically requests that InnoDB always be built. |
| 55 |
plugins="${plugins},innobase" |
| 56 |
- fi |
| 57 |
|
| 58 |
# like configuration=max-no-ndb |
| 59 |
if use cluster ; then |
| 60 |
@@ -584,8 +580,7 @@ mysql_src_unpack() { |
| 61 |
if mysql_version_is_at_least "5.1.12" ; then |
| 62 |
rebuilddirlist="." |
| 63 |
# TODO: check this with a cmake expert |
| 64 |
- use innodb \ |
| 65 |
- && cmake \ |
| 66 |
+ cmake \ |
| 67 |
-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ |
| 68 |
-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \ |
| 69 |
"storage/innobase" |
Archives