diff options
| author |   Brian Evans <grknight@gentoo.org> | 2014-10-08 17:25:46 +0000 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2014-10-08 17:25:46 +0000 |
| commit | 29ba525ee015075a9f7bc939041d2c74978eaf1f (patch) | |
| tree | 0fe5d590a9e067ef402877d00b8b028d1d5ddab4 /eclass/mysql-multilib.eclass | |
| parent | Initial commit, based on Andrew Udvare's GitHub overlay work at https://githu... (diff) | |
| download | gentoo-2-29ba525ee015075a9f7bc939041d2c74978eaf1f.tar.gz gentoo-2-29ba525ee015075a9f7bc939041d2c74978eaf1f.tar.bz2 gentoo-2-29ba525ee015075a9f7bc939041d2c74978eaf1f.zip | |
Sync eclasses from mysql overlay
Diffstat (limited to 'eclass/mysql-multilib.eclass')
| -rw-r--r-- | eclass/mysql-multilib.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index ca4d6c3d6510..5f42d4e7ba10 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.9 2014/09/26 17:56:29 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.10 2014/10/08 17:25:46 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -257,7 +257,7 @@ else fi if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then - mysql_version_is_at_least "5.7.5" && DEPEND="${DEPEND} dev-libs/boost:0=" + mysql_version_is_at_least "5.7.5" && DEPEND="${DEPEND} >=dev-libs/boost-1.56.0:0=" fi if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then @@ -506,14 +506,14 @@ multilib_src_configure() { filter-flags "-O" "-O[01]" CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" - CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" + CXXFLAGS="${CXXFLAGS} -felide-constructors" # Causes linkage failures. Upstream bug #59607 removes it if ! mysql_version_is_at_least "5.6" ; then CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" fi # As of 5.7, exceptions are used! if ! mysql_version_is_at_least "5.7" ; then - CXXFLAGS="${CXXFLAGS} -fno-exceptions" + CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-rtti" fi export CXXFLAGS |