1 |
robbat2 10/04/01 20:36:39 |
2 |
|
3 |
Modified: mysql.eclass |
4 |
Log: |
5 |
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. |
6 |
|
7 |
Revision Changes Path |
8 |
1.144 eclass/mysql.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.144&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.144&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.143&r2=1.144 |
13 |
|
14 |
Index: mysql.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v |
17 |
retrieving revision 1.143 |
18 |
retrieving revision 1.144 |
19 |
diff -p -w -b -B -u -u -r1.143 -r1.144 |
20 |
--- mysql.eclass 25 Mar 2010 20:58:31 -0000 1.143 |
21 |
+++ mysql.eclass 1 Apr 2010 20:36:39 -0000 1.144 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2009 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.143 2010/03/25 20:58:31 robbat2 Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.144 2010/04/01 20:36:39 robbat2 Exp $ |
27 |
|
28 |
# @ECLASS: mysql.eclass |
29 |
# @MAINTAINER: |
30 |
@@ -658,11 +658,17 @@ mysql_pkg_setup() { |
31 |
die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" |
32 |
fi |
33 |
|
34 |
- # Bug #290570 fun. Upstream made us need a fairly new GCC4. |
35 |
- if mysql_version_is_at_least "5.0.83" ; then |
36 |
+ # Bug #290570, 284946, 307251 |
37 |
+ # Upstream changes made us need a fairly new GCC4. |
38 |
+ # But only for 5.0.8[3-6]! |
39 |
+ if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then |
40 |
GCC_VER=$(gcc-version) |
41 |
case ${GCC_VER} in |
42 |
- 2*|3*|4.0|4.1|4.2) die "Active GCC too old! Must have at least GCC4.3" ;; |
43 |
+ 2*|3*|4.0|4.1|4.2) |
44 |
+ eerror "Some releases of MySQL required a very new GCC, and then" |
45 |
+ eerror "later release relaxed that requirement again. Either pick a" |
46 |
+ eerror "MySQL >=5.0.87, or use a newer GCC." |
47 |
+ die "Active GCC too old!" ;; |
48 |
esac |
49 |
fi |