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 | |
| 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')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/mysql-cmake.eclass | 8 | ||||
| -rw-r--r-- | eclass/mysql-multilib.eclass | 8 |
3 files changed, 14 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 51a960e1c9f1..cc2d85e488ad 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1380 2014/10/07 16:23:39 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1381 2014/10/08 17:25:46 grknight Exp $ + + 08 Oct 2014; Brian Evans <grknight@gentoo.org> mysql-cmake.eclass, + mysql-multilib.eclass: + Sync from overlay 07 Oct 2014; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass: Restrict mirror for qtwebkit wrt bug #524584 diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 979077db7120..1f38c70d9d9c 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.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-cmake.eclass,v 1.24 2014/07/31 22:26:07 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.25 2014/10/08 17:25:46 grknight Exp $ # @ECLASS: mysql-cmake.eclass # @MAINTAINER: @@ -272,6 +272,7 @@ mysql-cmake_src_prepare() { # Don't build bundled xz-utils rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" + sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die fi epatch_user @@ -414,11 +415,12 @@ mysql-cmake_src_install() { # Configuration stuff case ${MYSQL_PV_MAJOR} in 5.[1-4]*) mysql_mycnf_version="5.1" ;; - 5.[5-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.5" ;; + 5.5) mysql_mycnf_version="5.5" ;; + 5.[6-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.6" ;; esac einfo "Building default my.cnf (${mysql_mycnf_version})" insinto "${MY_SYSCONFDIR#${EPREFIX}}" - doins "${S}"/scripts/mysqlaccess.conf + [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf mycnf_src="my.cnf-${mysql_mycnf_version}" sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ "${FILESDIR}/${mycnf_src}" \ 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 |