[gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/01/31 05:00:43

  Modified:             mysql.eclass
  Log:
  Bug #290570, somewhere between 5.0.76 and 5.0.83, upstream made changes that require a fairly new GCC.

Revision  Changes    Path
1.125                eclass/mysql.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.125&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.125&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.124&r2=1.125

Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.124
retrieving revision 1.125
diff -p -w -b -B -u -u -r1.124 -r1.125
--- mysql.eclass	31 Jan 2010 03:05:54 -0000	1.124
+++ mysql.eclass	31 Jan 2010 05:00:43 -0000	1.125
@@ -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.124 2010/01/31 03:05:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.125 2010/01/31 05:00:43 robbat2 Exp $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:
@@ -553,6 +553,14 @@ 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
+		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" ;;
+		esac
+	fi
+
 	# This should come after all of the die statements
 	enewgroup mysql 60 || die "problem adding 'mysql' group"
 	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"