grknight 14/11/26 00:34:41 Modified: ChangeLog mysql-cmake.eclass mysql-multilib.eclass Log: Sync eclasses from mysql overlay
Revision Changes Path 1.1446 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1446&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1446&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1445&r2=1.1446 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1445 retrieving revision 1.1446 diff -u -r1.1445 -r1.1446 --- ChangeLog 24 Nov 2014 01:39:55 -0000 1.1445 +++ ChangeLog 26 Nov 2014 00:34:41 -0000 1.1446 @@ -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.1445 2014/11/24 01:39:55 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1446 2014/11/26 00:34:41 grknight Exp $ + + 26 Nov 2014; Brian Evans <grkni...@gentoo.org> musql-cmake.eclass, + mysql-multilib.eclass: + Sync from mysql overlay 24 Nov 2014; Mike Gilbert <flop...@gentoo.org> distutils-r1.eclass: eqawarn about /usr/lib/pypy/share instead of dying. 1.26 eclass/mysql-cmake.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.26&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.26&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.25&r2=1.26 Index: mysql-cmake.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- mysql-cmake.eclass 8 Oct 2014 17:25:46 -0000 1.25 +++ mysql-cmake.eclass 26 Nov 2014 00:34:41 -0000 1.26 @@ -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.25 2014/10/08 17:25:46 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.26 2014/11/26 00:34:41 grknight Exp $ # @ECLASS: mysql-cmake.eclass # @MAINTAINER: @@ -179,7 +179,6 @@ -DWITH_MYISAMMRG_STORAGE_ENGINE=1 -DWITH_MYISAM_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1 - $(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE) ) if in_iuse pbxt ; then @@ -187,10 +186,19 @@ fi if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then + + # Federated{,X} must be treated special otherwise they will not be built as plugins + if ! use extraengine ; then + mycmakeargs+=( + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 + -DPLUGIN_FEDERATED=0 + -DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1 + -DPLUGIN_FEDERATEDX=0 ) + fi + mycmakeargs+=( $(mysql-cmake_use_plugin oqgraph OQGRAPH) $(mysql-cmake_use_plugin sphinx SPHINX) - $(mysql-cmake_use_plugin extraengine FEDERATEDX) $(mysql-cmake_use_plugin tokudb TOKUDB) $(mysql-cmake_use_plugin pam AUTH_PAM) ) @@ -209,6 +217,23 @@ $(cmake-utils_use odbc CONNECT_WITH_ODBC) ) fi + + if in_iuse mroonga ; then + use mroonga || mycmakeargs+=( -DWITHOUT_MROONGA=1 ) + else + mycmakeargs+=( -DWITHOUT_MROONGA=1 ) + fi + + if in_iuse galera ; then + mycmakeargs+=( $(cmake-utils_use_with galera WSREP) ) + fi + + if mysql_version_is_at_least "10.1.1" ; then + mycmakeargs+=( $(cmake-utils_use_with innodb-lz4 INNODB_LZ4) + $(cmake-utils_use_with innodb-lzo INNODB_LZO) ) + fi + else + mycmakeargs+=( $(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE) ) fi if [[ ${PN} == "percona-server" ]]; then @@ -275,6 +300,12 @@ sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die fi + # Remove the bundled groonga if it exists + # There is no CMake flag, it simply checks for existance + if [[ -d "${S}"/storage/mroonga/vendor/groonga ]] ; then + rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga" + fi + epatch_user } 1.11 eclass/mysql-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.10&r2=1.11 Index: mysql-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mysql-multilib.eclass 8 Oct 2014 17:25:46 -0000 1.10 +++ mysql-multilib.eclass 26 Nov 2014 00:34:41 -0000 1.11 @@ -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.10 2014/10/08 17:25:46 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.11 2014/11/26 00:34:41 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -205,10 +205,19 @@ mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml" && \ REQUIRED_USE="odbc? ( extraengine !minimal ) xml? ( extraengine !minimal )" REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )" + + # MariaDB 10.1 introduces InnoDB/XtraDB compression with external libraries + # Choices are bzip2, lz4, lzma, lzo. bzip2 and lzma enabled by default as they are system libraries + mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} innodb-lz4 innodb-lzo" fi -if [[ ${PN} == "mariadb-galera" ]]; then - IUSE="${IUSE} +sst-rsync sst-xtrabackup" +if [[ -n "${WSREP_REVISION}" ]]; then + if [[ ${PN} == "mariadb" ]]; then + IUSE="${IUSE} galera sst-rsync sst-xtrabackup" + REQUIRED_USE="${REQUIRED_USE} sst-rsync? ( galera ) sst-xtrabackup? ( galera )" + else + IUSE="${IUSE} +sst-rsync sst-xtrabackup" + fi fi if [[ ${PN} == "percona-server" ]]; then @@ -273,7 +282,12 @@ " fi mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )" - mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" + mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[${MULTILIB_USEDEP}]" + + mysql_version_is_at_least "10.1.1" && DEPEND="${DEPEND} + innodb-lz4? ( app-arch/lz4 ) + innodb-lzo? ( dev-libs/lzo ) + " fi [[ ${PN} == "percona-server" ]] && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam:0= ) )" @@ -308,18 +322,23 @@ virtual/perl-Time-HiRes ) " fi -if [[ ${PN} == "mariadb-galera" ]] ; then +if [[ -n "${WSREP_REVISION}" ]] ; then # The wsrep API version must match between the ebuild and sys-cluster/galera. # This will be indicated by WSREP_REVISION in the ebuild and the first number # in the version of sys-cluster/galera # # lsof is required as of 5.5.38 and 10.0.11 for the rsync sst - RDEPEND="${RDEPEND} - sys-apps/iproute2 + + GALERA_RDEPEND="sys-apps/iproute2 =sys-cluster/galera-${WSREP_REVISION}* + " + if [[ ${PN} == "mariadb" ]]; then + GALERA_RDEPEND="galera? ( ${GALERA_RDEPEND} )" + fi + RDEPEND="${RDEPEND} ${GALERA_RDEPEND} sst-rsync? ( sys-process/lsof ) sst-xtrabackup? ( - dev-db/xtrabackup-bin + >=dev-db/xtrabackup-bin-2.2.4 net-misc/socat[ssl] ) " @@ -345,6 +364,9 @@ # my_config.h includes ABI specific data MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h ) +[[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "10.1.1" && \ + MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) + # wrap the config script MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) @@ -393,7 +415,8 @@ mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup fi - if use_if_iuse tokudb && [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then + if use_if_iuse tokudb && [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 || \ + $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." eerror "Please use gcc-config to switch to gcc-4.7 or later version." die @@ -470,12 +493,19 @@ -DWITHOUT_LIBWRAP=1 -DENABLED_LOCAL_INFILE=1 -DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock + -DINSTALL_UNIX_ADDRDIR=${EPREFIX}/var/run/mysqld/mysqld.sock -DWITH_SSL=$(usex ssl system bundled) -DWITH_DEFAULT_COMPILER_OPTIONS=0 -DWITH_DEFAULT_FEATURE_SET=0 - $(cmake-utils_use_enable systemtap DTRACE) ) + # systemtap only works on native ABI bug 530132 + if multilib_is_native_abi; then + mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) ) + else + mycmakeargs+=( -DENABLE_DTRACE=0 ) + fi + if in_iuse bindist ; then mycmakeargs+=( -DWITH_READLINE=$(usex bindist 1 0)
