| 1 |
robbat2 13/03/04 19:10:31 |
| 2 |
|
| 3 |
Modified: ChangeLog mysql-cmake.eclass |
| 4 |
Log: |
| 5 |
MySQL 5.6 needs to NOT have -fno-implicit-templates, also support epatch_user. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.704 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.704&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.704&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.703&r2=1.704 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.703 |
| 18 |
retrieving revision 1.704 |
| 19 |
diff -p -w -b -B -u -u -r1.703 -r1.704 |
| 20 |
--- ChangeLog 3 Mar 2013 12:05:08 -0000 1.703 |
| 21 |
+++ ChangeLog 4 Mar 2013 19:10:31 -0000 1.704 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.703 2013/03/03 12:05:08 pacho Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.704 2013/03/04 19:10:31 robbat2 Exp $ |
| 27 |
+ |
| 28 |
+ 04 Mar 2013; Robin H. Johnson <robbat2@g.o> mysql-cmake.eclass: |
| 29 |
+ MySQL 5.6 needs to NOT have -fno-implicit-templates, also support |
| 30 |
+ epatch_user. |
| 31 |
|
| 32 |
03 Mar 2013; Pacho Ramos <pacho@g.o> readme.gentoo.eclass: |
| 33 |
Change formatting tool as discussed with Ulrich Müller in bug #460050, |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.15 eclass/mysql-cmake.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.15&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.15&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.14&r2=1.15 |
| 42 |
|
| 43 |
Index: mysql-cmake.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v |
| 46 |
retrieving revision 1.14 |
| 47 |
retrieving revision 1.15 |
| 48 |
diff -p -w -b -B -u -u -r1.14 -r1.15 |
| 49 |
--- mysql-cmake.eclass 13 Feb 2013 00:40:57 -0000 1.14 |
| 50 |
+++ mysql-cmake.eclass 4 Mar 2013 19:10:31 -0000 1.15 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
-# Copyright 1999-2012 Gentoo Foundation |
| 53 |
+# Copyright 1999-2013 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.14 2013/02/13 00:40:57 robbat2 Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.15 2013/03/04 19:10:31 robbat2 Exp $ |
| 57 |
|
| 58 |
# @ECLASS: mysql-cmake.eclass |
| 59 |
# @MAINTAINER: |
| 60 |
@@ -221,6 +221,7 @@ mysql-cmake_src_prepare() { |
| 61 |
[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" |
| 62 |
|
| 63 |
rm -f "scripts/mysqlbug" |
| 64 |
+ epatch_user |
| 65 |
} |
| 66 |
|
| 67 |
# @FUNCTION: mysql-cmake_src_configure |
| 68 |
@@ -275,7 +276,10 @@ mysql-cmake_src_configure() { |
| 69 |
|
| 70 |
CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" |
| 71 |
CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" |
| 72 |
+ # Causes linkage failures. Upstream bug #59607 removes it |
| 73 |
+ if ! mysql_version_is_at_least "5.6" ; then |
| 74 |
CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" |
| 75 |
+ fi |
| 76 |
export CXXFLAGS |
| 77 |
|
| 78 |
# bug #283926, with GCC4.4, this is required to get correct behavior. |
Archives