grknight 14/10/08 17:25:46 Modified: ChangeLog mysql-cmake.eclass mysql-multilib.eclass Log: Sync eclasses from mysql overlay
Revision Changes Path 1.1381 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1381&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1381&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1380&r2=1.1381 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1380 retrieving revision 1.1381 diff -u -r1.1380 -r1.1381 --- ChangeLog 7 Oct 2014 16:23:39 -0000 1.1380 +++ ChangeLog 8 Oct 2014 17:25:46 -0000 1.1381 @@ -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 <grkni...@gentoo.org> mysql-cmake.eclass, + mysql-multilib.eclass: + Sync from overlay 07 Oct 2014; Davide Pesavento <p...@gentoo.org> qt5-build.eclass: Restrict mirror for qtwebkit wrt bug #524584 1.25 eclass/mysql-cmake.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.25&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.25&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.24&r2=1.25 Index: mysql-cmake.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mysql-cmake.eclass 31 Jul 2014 22:26:07 -0000 1.24 +++ mysql-cmake.eclass 8 Oct 2014 17:25:46 -0000 1.25 @@ -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 @@ # 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 @@ # 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}" \ 1.10 eclass/mysql-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.9&r2=1.10 Index: mysql-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mysql-multilib.eclass 26 Sep 2014 17:56:29 -0000 1.9 +++ mysql-multilib.eclass 8 Oct 2014 17:25:46 -0000 1.10 @@ -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 @@ 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 @@ 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
