summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2008-11-14 01:46:24 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2008-11-14 01:46:24 +0000
commitebf4d0616cfc93408577a9bda12ed502e284d342 (patch)
treed302cce4357a2e471e7dffefa20c0a1a1885d4f3 /eclass/mysql.eclass
parentBug #240155, mysql should be in DEPEND as well. (diff)
downloadgentoo-2-ebf4d0616cfc93408577a9bda12ed502e284d342.tar.gz
gentoo-2-ebf4d0616cfc93408577a9bda12ed502e284d342.tar.bz2
gentoo-2-ebf4d0616cfc93408577a9bda12ed502e284d342.zip
Bug #224067 - disable berkdb now for all mysql builds >=5.0.60.
Diffstat (limited to 'eclass/mysql.eclass')
-rw-r--r--eclass/mysql.eclass13
1 files changed, 10 insertions, 3 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 8f0e74cd8ba6..f66326d3e33c 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.97 2008/10/16 18:48:42 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.98 2008/11/14 01:46:24 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -352,8 +352,15 @@ configure_40_41_50() {
else
myconf="${myconf} $(use_with ssl openssl)"
fi
-
- if use berkdb ; then
+
+ if mysql_version_is_at_least "5.0.60" ; then
+ if use berkdb ; then
+ elog "Berkeley DB support was disabled due to build failures"
+ elog "on multiple arches, go to a version earlier than 5.0.60"
+ elog "if you want it again. Gentoo bug #224067."
+ fi
+ myconf="${myconf} --without-berkeley-db"
+ elif use berkdb ; then
# The following fix is due to a bug with bdb on SPARC's. See:
# http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
# It comes down to non-64-bit safety problems.