diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2013-03-04 19:10:31 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2013-03-04 19:10:31 +0000 |
| commit | 7532f1999ee24738bc3c140eca581ba004d22c71 (patch) | |
| tree | eddfd193453335393231533f56826d6c22d6c11d /eclass | |
| parent | Version bump thanks to corentin labbe <clabbe.montjoie@gmail.com> (diff) | |
| download | historical-7532f1999ee24738bc3c140eca581ba004d22c71.tar.gz historical-7532f1999ee24738bc3c140eca581ba004d22c71.tar.bz2 historical-7532f1999ee24738bc3c140eca581ba004d22c71.zip | |
MySQL 5.6 needs to NOT have -fno-implicit-templates, also support epatch_user.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/mysql-cmake.eclass | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index ca3334d779d8..bb0c514fa1f1 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.703 2013/03/03 12:05:08 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.704 2013/03/04 19:10:31 robbat2 Exp $ + + 04 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> mysql-cmake.eclass: + MySQL 5.6 needs to NOT have -fno-implicit-templates, also support + epatch_user. 03 Mar 2013; Pacho Ramos <pacho@gentoo.org> readme.gentoo.eclass: Change formatting tool as discussed with Ulrich Müller in bug #460050, diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 955e2878f357..f47e5fd619ae 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.14 2013/02/13 00:40:57 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.15 2013/03/04 19:10:31 robbat2 Exp $ # @ECLASS: mysql-cmake.eclass # @MAINTAINER: @@ -221,6 +221,7 @@ mysql-cmake_src_prepare() { [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" rm -f "scripts/mysqlbug" + epatch_user } # @FUNCTION: mysql-cmake_src_configure @@ -275,7 +276,10 @@ mysql-cmake_src_configure() { CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" - CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" + # Causes linkage failures. Upstream bug #59607 removes it + if ! mysql_version_is_at_least "5.6" ; then + CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" + fi export CXXFLAGS # bug #283926, with GCC4.4, this is required to get correct behavior. |