From 61b37fe6dcebc0b54b41e98a961af04c628cd1af Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Thu, 1 Apr 2010 20:36:39 +0000 Subject: [PATCH] Followup on bug #284946, #293801, #310615, #307251: In 5.0.87, the mutex locking code was changed a lot again, so that while 5.0.84 required a newer GCC due to the HAVE_ATOMIC_BUILTINS error, newer releases do NOT need those GCC versions anymore. This also frees up ~hppa to do more stabilization. --- eclass/mysql.eclass | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 36044d4dca8a..592de953d0e6 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.143 2010/03/25 20:58:31 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.144 2010/04/01 20:36:39 robbat2 Exp $ # @ECLASS: mysql.eclass # @MAINTAINER: @@ -658,11 +658,17 @@ mysql_pkg_setup() { die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" fi - # Bug #290570 fun. Upstream made us need a fairly new GCC4. - if mysql_version_is_at_least "5.0.83" ; then + # Bug #290570, 284946, 307251 + # Upstream changes made us need a fairly new GCC4. + # But only for 5.0.8[3-6]! + if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then GCC_VER=$(gcc-version) case ${GCC_VER} in - 2*|3*|4.0|4.1|4.2) die "Active GCC too old! Must have at least GCC4.3" ;; + 2*|3*|4.0|4.1|4.2) + eerror "Some releases of MySQL required a very new GCC, and then" + eerror "later release relaxed that requirement again. Either pick a" + eerror "MySQL >=5.0.87, or use a newer GCC." + die "Active GCC too old!" ;; esac fi -- 2.26.2